Merge branch 'release/0.2.0' into stable

.shippable.yml

@@ -1,64 +1,7 @@
-build_image: shippableimages/ubuntu1404_base
-cache: true
 before_install:
-  - dpkg --add-architecture i386
-  - shippable_retry sudo apt-get -y -q update
-  - export QT_DIR=$HOME/qt/5.4/mingw491_32
+  - shippable_retry sudo apt-get -y -qq update
 install:
-  - shippable_retry sudo apt-get -y -q install --no-install-recommends wine p7zip-full ca-certificates curl
-  # Install Qt
-  - bash -c '[ -d $HOME/qt/Tools ] || mkdir -p $HOME/qt/OUT'
-  - bash -c '[ -d $HOME/qt/Tools ] || curl -Lso $HOME/qt/qt.exe http://download.qt.io/official_releases/qt/5.4/5.4.0/qt-opensource-windows-x86-mingw491_opengl-5.4.0.exe'
-  - bash -c '[ -d $HOME/qt/Tools ] || wine $HOME/qt/qt.exe --dump-binary-data -o $HOME/qt/OUT'
-  - bash -c '[ -d $HOME/qt/Tools ] || 7z x $HOME/qt/OUT/qt.54.win32_mingw491/5.4.0-1i686-4.9.1-release-posix-dwarf-rt_v3-rev2-runtime.7z -o$HOME/qt'
-  - bash -c '[ -d $HOME/qt/Tools ] || 7z x $HOME/qt/OUT/qt.54.win32_mingw491/5.4.0-1icu_53_1_mingw_builds_4_9_1_posix_dwarf_32.7z -o$HOME/qt'
-  - bash -c '[ -d $HOME/qt/Tools ] || 7z x $HOME/qt/OUT/qt.54.win32_mingw491/5.4.0-1qt5_addons.7z -o$HOME/qt'
-  - bash -c '[ -d $HOME/qt/Tools ] || 7z x $HOME/qt/OUT/qt.54.win32_mingw491/5.4.0-1qt5_essentials.7z -o$HOME/qt'
-  - bash -c '[ -d $HOME/qt/Tools ] || 7z x $HOME/qt/OUT/qt.tools.win32_mingw491/4.9.1-2i686-4.9.1-release-posix-dwarf-rt_v3-rev2.7z -o$HOME/qt'
-  - rm -rf $HOME/qt/OUT
-  - rm -f $HOME/qt/qt.exe
-  # Install libarchive headers and library
-  - bash -c '[ -f $HOME/qt/Tools/mingw491_32/i686-w64-mingw32/include/archive.h ] || curl -LOs https://bitbucket.org/zealdocs/zeal-win32-binary-downloads/downloads/libarchive-3.1.2-win32-mingw491.7z'
-  - bash -c '[ -f $HOME/qt/Tools/mingw491_32/i686-w64-mingw32/include/archive.h ] || 7z x libarchive-3.1.2-win32-mingw491.7z -o$HOME/qt/Tools/mingw491_32/i686-w64-mingw32'
-  - rm -f libarchive-3.1.2-win32-mingw491.7z
-  # Setup environment
-  - echo '[Paths]' > $QT_DIR/bin/qt.conf
-  - echo 'Prefix=..' >> $QT_DIR/bin/qt.conf
-  - echo '[HKEY_CURRENT_USER\Environment]' > $HOME/qt/temp.reg
-  - echo '"QMAKESPEC"="BASEDIR\\5.4\\mingw491_32\\mkspecs\\win32-g++"' >> $HOME/qt/temp.reg
-  - echo '"QTDIR"="BASEDIR\\5.4\\mingw491_32"' >> $HOME/qt/temp.reg
-  - echo '"PATH"="BASEDIR\\Tools\\mingw491_32\\libexec\\gcc\\i686-w64-mingw32;BASEDIR\\Tools\\mingw491_32\\bin;BASEDIR\\5.4\\mingw491_32\\bin"' >> $HOME/qt/temp.reg
-  - sed -i "s.BASEDIR.Z:$HOME/qt.g" $HOME/qt/temp.reg
-  - sed -i 's./.\\\\.g' $HOME/qt/temp.reg
-  - wine regedit $HOME/qt/temp.reg
-before_script:
-  - export ZEAL_VERSION=`date +%Y%m%d`
-  - export ZEAL_DIR=zeal-$ZEAL_VERSION
+  - shippable_retry sudo apt-get -y -qq install --no-install-recommends qt5-default libqt5webkit5-dev libqt5x11extras5-dev libarchive-dev libxcb-keysyms1-dev
 script:
-  - wine qmake
-  - wine mingw32-make
-after_success:
-  # Prepare ZIP package
-  - mkdir $ZEAL_DIR
-  - cp bin/zeal.exe $ZEAL_DIR
-  - for dir in imageformats platforms sqldrivers; do mkdir $ZEAL_DIR/$dir; done
-  - cp $HOME/qt/Tools/mingw491_32/opt/bin/ssleay32.dll $ZEAL_DIR
-  - cp $HOME/qt/Tools/mingw491_32/opt/bin/libeay32.dll $ZEAL_DIR
-  - for l in gif ico jpeg tiff; do cp $QT_DIR/plugins/imageformats/q$l.dll $ZEAL_DIR/imageformats; done
-  - cp $QT_DIR/plugins/platforms/qwindows.dll $ZEAL_DIR/platforms
-  - cp $QT_DIR/plugins/sqldrivers/qsqlite.dll $ZEAL_DIR/sqldrivers
-  - cp $QT_DIR/bin/libstdc++-6.dll $ZEAL_DIR
-  - cp $QT_DIR/bin/libgcc_s_dw2-1.dll $ZEAL_DIR
-  - cp $QT_DIR/bin/libwinpthread-1.dll $ZEAL_DIR
-  - cp $QT_DIR/bin/icu*.dll $ZEAL_DIR
-  - for l in Core Gui Multimedia MultimediaWidgets Network OpenGL Qml Quick Sql WebKit WebKitWidgets WebChannel Widgets Positioning PrintSupport Sensors; do cp $QT_DIR/bin/Qt5$l.dll $ZEAL_DIR; done
-  # Pack everything into ZIP
-  - 7z a -mx=9 $ZEAL_DIR.zip $ZEAL_DIR
-  # Upload to BitBucket
-  - bash -c 'curl -H "Content-Type:application/octet-stream" -H "Auth-Token:$AUTH_TOKEN" --data-binary @$ZEAL_DIR.zip ci2bb.herokuapp.com || true'
-  # Cleanup
-  - rm -rf $ZEAL_DIR*
-
-env:
-  global:
-    - secure: LRSLJQbkpc6kkWDVbmvCARm20edC+1RCCgSdEzK0GfG66V+dyGYi6ubFBv1M+kV9YEVY1FkkZctiKlneJLpi/YS3pSJF7bEhYggtxNxRD+9bAVk4GZwVxT7TUw1ZPtLUkWc7L7PqgIO+OOiI8THwsONBNcn5q4fLsByhlt2XOyGPOrQYmfmqjWpgErgI0K4aYoJfoJGTgV2v5sZ+owSkMniyJY5WU9iZkRLO63ddmk72d9eq8ECwgQqxDyhR9/WtHkMPCrwVh06RFd9jG4DfCNDDZRdQLdGxCPXTNwP7QHqG9mKFRQeM91gs/tKlhFFlfPHMckWiBK4hAo+WLC+Ekg==
+  - qmake
+  - make

README.md

@@ -1,8 +1,5 @@
 # Zeal
 
-[![Build Status](https://api.shippable.com/projects/54ac2ce4d46935d5fbc19b84/badge?branchName=master)](https://app.shippable.com/projects/54ac2ce4d46935d5fbc19b84/builds/latest)
-[![AppVeyor](https://img.shields.io/appveyor/ci/trollixx/zeal.svg?style=flat-square)](https://ci.appveyor.com/project/trollixx/zeal)
-[![Coverity Scan](https://img.shields.io/coverity/scan/4271.svg?style=flat-square)](https://scan.coverity.com/projects/4271)
 [![IRC](https://img.shields.io/badge/irc-%23zealdocs-blue.svg?style=flat-square)](https://kiwiirc.com/client/irc.freenode.net/#zealdocs)
 
 > **zeal** *noun*
@@ -13,34 +10,42 @@
 >
 > (from WordNet 3.0)
 
-Zeal is a simple offline documentation browser inspired by [Dash](http://kapeli.com/dash/).
+Zeal is a simple offline documentation browser inspired by [Dash](https://kapeli.com/dash).
+
+![Screenshot](https://i.imgur.com/SiLvpz8.png)
+
+[More screenshots](https://imgur.com/a/eVi97)
 
-![Screenshot](http://i.imgur.com/SiLvpz8.png)
+## Build Status
+
+[![Coverity Scan](https://img.shields.io/coverity/scan/4271.svg?style=flat-square)](https://scan.coverity.com/projects/4271)
 
-[More screenshots](http://imgur.com/a/eVi97)
+OS \ Branch | master | stable
+------------|--------|-------
+Linux | [![Shippable](https://img.shields.io/shippable/54ac2ce4d46935d5fbc19b84/master.svg?style=flat-square)](https://app.shippable.com/builds/54ac2ce4d46935d5fbc19b84) | [![Shippable](https://img.shields.io/shippable/54ac2ce4d46935d5fbc19b84/stable.svg?style=flat-square)](https://app.shippable.com/builds/54ac2ce4d46935d5fbc19b84)
+Windows | [![AppVeyor](https://img.shields.io/appveyor/ci/trollixx/zeal/master.svg?style=flat-square)](https://ci.appveyor.com/project/trollixx/zeal) | [![AppVeyor](https://img.shields.io/appveyor/ci/trollixx/zeal/stable.svg?style=flat-square)](https://ci.appveyor.com/project/trollixx/zeal)
 
 ## Download
 
-For details about binary packages (currently available for Windows and Ubuntu) see [downloads page](http://zealdocs.org/download.html). Also, the latest unstable builds are available [here]( https://bitbucket.org/zealdocs/zeal-win32-binary-downloads/downloads).
+Get binary builds for Windows and Linux from the [download page](https://zealdocs.org/download.html).
 
 ## How to use
 
 After installing Zeal, you need to download docsets. Go to *File->Options->Docsets*, select the ones you want, and click the *Download* button.
 
 ## How to compile
 
-If you prefer to compile Zeal manually.
-
 ### Requirements
-* [Qt](https://www.qt.io/) (version 5.2.0 or above is required)
-* [libarchive](http://libarchive.org/)
-* Optionally [libappindicator](https://launchpad.net/libappindicator) for Unity users
+* [Qt](https://www.qt.io/) version 5.2.0 or above. Required modules: Qt WebKit Widgets, Qt SQL plugin for SQLite, Qt X11 Extras (X11 only).
+* [libarchive](http://libarchive.org/).
+* X11 only: `xcb-util-keysyms`.
+* Ubuntu Unity only: [libappindicator](https://launchpad.net/libappindicator).
 
-To compile it, run `qmake` and `make`.
+To compile Zeal run `qmake` and then `make`. Linux users can install Zeal with `make install` command.
 
 ## Query & Filter docsets
 
-You can limit the search scope by using ':' to indicate the desired docsets.
+You can limit the search scope by using ':' to indicate the desired docsets:
 
 `java:BaseDAO`
 
@@ -56,4 +61,17 @@ If you prefer, you can start Zeal with a query from command line:
 
 ## Creating your own docsets
 
-You can use [Dash's instructions for generating docsets](http://kapeli.com/docsets).
+You can use [Dash's instructions for generating docsets](https://kapeli.com/docsets).
+
+## Contact and Support
+
+We want your feedback! Here's a list of different ways to contact developers and request help:
+* Report bugs and submit feature requests to [GitHub issues](https://github.com/zealdocs/zeal/issues).
+* Ask any questions in our [Google Group](https://groups.google.com/d/forum/zealdocs). You can simply send an email to [email protected].
+* For a quick chat with developers and other Zeal users use our IRC channel: #zealdocs on [Freenode](https://freenode.net/). Also available through Kiwi IRC [web interface](https://kiwiirc.com/client/irc.freenode.net/#zealdocs). Please, take into consideration possible time zone differences.
+* Finally, for a private communications send us [email](mailto:[email protected]).
+* And do not forget to follow [@zealdocs](https://twitter.com/zealdocs) on Twitter!
+
+## License
+
+This software is licensed under the terms of the GNU General Public License version 3 (GPLv3). Full text of the license is available in the [COPYING](https://github.com/zealdocs/zeal/blob/master/COPYING) file and [online](http://opensource.org/licenses/gpl-3.0.html).

src/3rdparty/qxtglobalshortcut/qxtglobalshortcut.cpp

@@ -1,4 +1,25 @@
-#include "qxtglobalshortcut.h"
+/****************************************************************************
+**
+** Copyright (C) 2015 Oleg Shparber
+** Copyright (C) 2013-2014 Jerzy Kozera
+** Contact: http://zealdocs.org/contact.html
+**
+** This file is part of Zeal.
+**
+** Zeal is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation, either version 3 of the License, or
+** (at your option) any later version.
+**
+** Zeal is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with Zeal. If not, see <http://www.gnu.org/licenses/>.
+**
+****************************************************************************/
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -29,13 +50,15 @@
 ** <http://libqxt.org>  <[email protected]>
 *****************************************************************************/
 
+#include "qxtglobalshortcut.h"
 #include "qxtglobalshortcut_p.h"
 
 #include <QAbstractEventDispatcher>
 
 #ifndef Q_OS_OSX
 int QxtGlobalShortcutPrivate::ref = 0;
 #endif // Q_OS_OSX
+
 QHash<QPair<quint32, quint32>, QxtGlobalShortcut *> QxtGlobalShortcutPrivate::shortcuts;
 
 QxtGlobalShortcutPrivate::QxtGlobalShortcutPrivate(QxtGlobalShortcut *qq) :
@@ -96,11 +119,14 @@ bool QxtGlobalShortcutPrivate::unsetShortcut()
     return res;
 }
 
-void QxtGlobalShortcutPrivate::activateShortcut(quint32 nativeKey, quint32 nativeMods)
+bool QxtGlobalShortcutPrivate::activateShortcut(quint32 nativeKey, quint32 nativeMods)
 {
-    QxtGlobalShortcut* shortcut = shortcuts.value(qMakePair(nativeKey, nativeMods));
-    if (shortcut && shortcut->isEnabled())
-        emit shortcut->activated();
+    QxtGlobalShortcut *shortcut = shortcuts.value(qMakePair(nativeKey, nativeMods));
+    if (!shortcut || !shortcut->isEnabled())
+        return false;
+
+    emit shortcut->activated();
+    return true;
 }
 
 /*!

src/3rdparty/qxtglobalshortcut/qxtglobalshortcut.h

@@ -1,4 +1,25 @@
-#ifndef QXTGLOBALSHORTCUT_H
+/****************************************************************************
+**
+** Copyright (C) 2015 Oleg Shparber
+** Copyright (C) 2013-2014 Jerzy Kozera
+** Contact: http://zealdocs.org/contact.html
+**
+** This file is part of Zeal.
+**
+** Zeal is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation, either version 3 of the License, or
+** (at your option) any later version.
+**
+** Zeal is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with Zeal. If not, see <http://www.gnu.org/licenses/>.
+**
+****************************************************************************/
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -29,16 +50,15 @@
 ** <http://libqxt.org>  <[email protected]>
 *****************************************************************************/
 
+#ifndef QXTGLOBALSHORTCUT_H
 #define QXTGLOBALSHORTCUT_H
 
-#include "qxtglobal.h"
-
 #include <QKeySequence>
 #include <QObject>
 
 class QxtGlobalShortcutPrivate;
 
-class QXT_GUI_EXPORT QxtGlobalShortcut : public QObject
+class QxtGlobalShortcut : public QObject
 {
     Q_OBJECT
 

src/3rdparty/qxtglobalshortcut/qxtglobalshortcut.pri

@@ -1,12 +1,20 @@
-DEFINES += BUILD_QXT_GUI
-
 INCLUDEPATH += $$PWD
 
 HEADERS += $$files($$PWD/*.h)
-
 SOURCES += $$PWD/qxtglobalshortcut.cpp
-macx:SOURCES += $$PWD/qxtglobalshortcut_mac.cpp
-unix:!macx:SOURCES += $$PWD/qxtglobalshortcut_x11.cpp
+
+unix:!macx {
+    QT += x11extras
+
+    CONFIG += link_pkgconfig
+    PKGCONFIG += x11 xcb xcb-keysyms
+
+    SOURCES += $$PWD/qxtglobalshortcut_x11.cpp
+}
+
 win32:SOURCES += $$PWD/qxtglobalshortcut_win.cpp
 
-macx:LIBS += -framework Carbon
+macx {
+    SOURCES += $$PWD/qxtglobalshortcut_mac.cpp
+    LIBS += -framework Carbon
+}

src/3rdparty/qxtglobalshortcut/qxtglobalshortcut_mac.cpp

@@ -1,4 +1,25 @@
-#include <Carbon/Carbon.h>
+/****************************************************************************
+**
+** Copyright (C) 2015 Oleg Shparber
+** Copyright (C) 2013-2014 Jerzy Kozera
+** Contact: http://zealdocs.org/contact.html
+**
+** This file is part of Zeal.
+**
+** Zeal is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation, either version 3 of the License, or
+** (at your option) any later version.
+**
+** Zeal is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with Zeal. If not, see <http://www.gnu.org/licenses/>.
+**
+****************************************************************************/
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -30,10 +51,12 @@
 *****************************************************************************/
 
 #include "qxtglobalshortcut_p.h"
-#include <QMap>
-#include <QHash>
-#include <QtDebug>
+
 #include <QApplication>
+#include <QHash>
+#include <QMap>
+
+#include <Carbon/Carbon.h>
 
 typedef QPair<uint, uint> Identifier;
 static QMap<quint32, EventHotKeyRef> keyRefs;