Merge branch 'master' into master

Author: Skycoder42

.qmake.conf

@@ -3,4 +3,4 @@ load(qt_build_config)
 CONFIG += warning_clean exceptions
 DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
 
-MODULE_VERSION = 2.1.3
+MODULE_VERSION = 2.1.5

.travis.yml

@@ -4,26 +4,34 @@ services:
   - docker
 
 sudo: required
+dist: trusty
+osx_image: xcode10.1
 
 env:
   global:
-    - QT_VER=5.10.0
+    - QDEP_CACHE_DIR=$HOME/.qdep-cache
+    - QT_VER=5.12.1
+    - DOCKER_IMAGE=base
+    - MAKE_RUN_TESTS=true
+    - TARGET_NAME=qtautoupdater
 
 matrix:
   include:
     - os: linux
-      dist: trusty
       env:
         - PLATFORM=gcc_64
         - BUILD_DOC=true
+        - BUILD_EXAMPLES=true
+    - os: linux
+      env:
+        - PLATFORM=emscripten
     - os: osx
-      osx_image: xcode9.1
       env:
         - PLATFORM=clang_64
 
 before_install:
   - git clone https://github.com/Skycoder42/QtModules.git ./qtmodules-travis
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; else ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; fi
+  - travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh
 
 script:
   - ./qtmodules-travis/ci/$TRAVIS_OS_NAME/build.sh
@@ -36,7 +44,7 @@ deploy:
   api_key:
     secure: xYCYVjv0F8C/5K5rt/oTofAU+PQNHp0wAwc8YHf8Fqf/VClFFxCVqcC9XWvy6bEnYotfkSk9TGo1CKW6fW9yZ0kQ4CjD1/V0U5PJweBqkY3i25QxWsHQ3rmzd1KWYxIra0mIujDiXbQWS3teMJpV2tpEMo+dTwXu4/mnQmbejlUcGAVgZbUOCgYvOKcBAZfeG8LnXvJLjfrJPoa5sXjrZSPbjiQBtQw0Cr2f1YPzaPftZB3pzsOtfELk+fG1h5sRfgE8rTCErQG3nkGytuchYhMH4ze0bsgHj04LeaqwRSrXQi67ZobrWIGNAUTjIlqI8NJLXHOYM6E8EgIDJVWIVhzmMvnwYyLOpZY//OVS1MNOBbhsmQ/vJC0xfLVR5EUPKGiqCAlNZ3O9ADwm+mryoCZ4S5I+13qa5xRQosmzh6kPzgziVhmBkG+bKODDRWUn8qBC4YAaViyAq7KgS3i/Rt8NzKI1Dti9MulP+eaf5LHsudhz7SosyrsEFVtdpUDICs+gN6gPWPaH87spKY87Hq07mz6blvIxK9TmnmYMrxtXKiCHIfmGON4XiQMxI+woR5h9m/+htWyJJqYAsTWY+gS5Mg7t9tPB7kIbCkNkcpcpVRvWsYM1ZySQ567PvADvK6oCVogSfFQLiZgnTTLR8WObqtQdD/Dzer7CXUTrIqM=
   file_glob: true
-  file: install/opt/build_*_$QT_VER.tar.xz
+  file: install/${TARGET_NAME}_*_$QT_VER.tar.xz
   on:
     repo: Skycoder42/QtAutoUpdater
     tags: true
@@ -46,7 +54,7 @@ before_cache:
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
-    - $HOME/.cache/Skycoder42/qpmx
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
+    - $QDEP_CACHE_DIR

README.md

@@ -6,6 +6,7 @@ The Qt auto updater library is a library to automatically check for updates and
 
 [![Travis Build Status](https://travis-ci.org/Skycoder42/QtAutoUpdater.svg?branch=master)](https://travis-ci.org/Skycoder42/QtAutoUpdater)
 [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/5iw2byrvnsdfytxv/branch/master?svg=true)](https://ci.appveyor.com/project/Skycoder42/qtautoupdater/branch/master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a5b2e3cc66c644869515d2f3a5c3ff49)](https://www.codacy.com/app/Skycoder42/QtAutoUpdater)
 
 ## Features
 ### Core Library
@@ -42,22 +43,19 @@ Here some sample screenshots of the gui (The rocket of the information dialog is
 There are multiple ways to install the Qt module, sorted by preference:
 
 1. Simply add my repository to your Qt MaintenanceTool (Image-based How-To here: [Add custom repository](https://github.com/Skycoder42/QtModules/blob/master/README.md#add-my-repositories-to-qt-maintenancetool)):
-	1. Open the MaintenanceTool, located in your Qt install directory (e.g. `~/Qt/MaintenanceTool`)
-	2. Select `Add or remove components` and click on the `Settings` button
-	3. Go to `Repositories`, scroll to the bottom, select `User defined repositories` and press `Add`
-	4. In the right column (selected by default), type:
+	1. Start the MaintenanceTool from the commandline using `/path/to/MaintenanceTool --addTempRepository <url>` with one of the following urls (GUI-Method is currently broken, see [QTIFW-1156](https://bugreports.qt.io/browse/QTIFW-1156)) - This must be done *every time* you start the tool:
 		- On Linux: https://install.skycoder42.de/qtmodules/linux_x64
 		- On Windows: https://install.skycoder42.de/qtmodules/windows_x86
 		- On Mac: https://install.skycoder42.de/qtmodules/mac_x64
-	5. Press `Ok`, make shure `Add or remove components` is still selected, and continue the install (`Next >`)
-	6. A new entry appears under all supported Qt Versions (e.g. `Qt > Qt 5.8 > Skycoder42 Qt modules`)
-	7. You can install either all of my modules, or select the one you need: `Qt Auto Updater`
-	8. Continue the setup and thats it! you can now use the module for all of your installed Kits for that Qt Version
+	2. A new entry appears under all supported Qt Versions (e.g. `Qt > Qt 5.11 > Skycoder42 Qt modules`)
+	3. You can install either all of my modules, or select the one you need: `Qt Auto Updater`
+	4. Continue the setup and thats it! you can now use the module for all of your installed Kits for that Qt
 2. Download the compiled modules from the release page. **Note:** You will have to add the correct ones yourself and may need to adjust some paths to fit your installation!
-3. Build it yourself! **Note:** This requires perl, [qpmx](https://github.com/Skycoder42/qpmx) and [qpm](https://github.com/Cutehacks/qpm) to be installed. If you don't have/need cmake, you can ignore the related warnings. To automatically build and install to your Qt installation, run:
+3. Build it yourself! **Note:** This requires perl to be installed. If you don't have/need cmake, you can ignore the related warnings. To automatically build and install to your Qt installation, run:
+	- Install and prepare [qdep](https://github.com/Skycoder42/qdep#installation)
 	- `qmake`
-	- `make qmake_all`
-	- `make`
+	- `make` (If you want the tests/examples/etc. run `make all`)
+	- Optional step: `make doxygen` to generate the documentation
 	- `make install`
 
 ## Usage

appveyor.yml

@@ -5,24 +5,26 @@ image:
 version: build-{build}
 
 environment:
-  QT_VER: 5.10.0
+  QT_VER: 5.12.1
+  MAKE_RUN_TESTS: true
+  TARGET_NAME: qtautoupdater
 
   matrix:
     - PLATFORM: msvc2017_64
+    - PLATFORM: msvc2017
+    - PLATFORM: mingw73_64
     - PLATFORM: msvc2015_64
-    - PLATFORM: msvc2015
-    - PLATFORM: mingw53_32
 
 matrix:
   exclude:
     - PLATFORM: msvc2017_64
       image: Visual Studio 2015
-    - PLATFORM: mingw53_32
+    - PLATFORM: msvc2017
+      image: Visual Studio 2015
+    - PLATFORM: mingw73_64
       image: Visual Studio 2015
     - PLATFORM: msvc2015_64
       image: Visual Studio 2017
-    - PLATFORM: msvc2015
-      image: Visual Studio 2017
 
 install:
   - git clone https://github.com/Skycoder42/QtModules.git .\qtmodules-travis
@@ -35,7 +37,7 @@ after_build:
   - .\qtmodules-travis\ci\win\upload-prepare.bat
 
 artifacts:
-  - path: install\build_*_%QT_VER%.zip
+  - path: install\%TARGET_NAME%_*_%QT_VER%.zip
 
 deploy:
   provider: GitHub
@@ -47,4 +49,4 @@ deploy:
     appveyor_repo_tag: true
 
 cache:
-  - 'C:\Users\appveyor\AppData\Local\Skycoder42\qpmx\cache -> appveyor.yml'
+  - 'C:\Users\appveyor\AppData\Local\qdep\qdep\Cache -> appveyor.yml'

deploy.json

@@ -0,0 +1,11 @@
+{
+	"title": "QtAutoUpdater",
+	"description": "A Qt library to automatically check for updates and install them.",
+	"modules": [ "QtAutoUpdaterCore", "QtAutoUpdaterGui" ],
+	"dependencies": [],
+	"excludes": [ "android", "ios", "winrt" ],
+	"license": {
+		"name": "BSD-3-Clause",
+		"path": "LICENSE"
+	}
+}

doc/Doxyfile

@@ -938,7 +938,8 @@ EXCLUDE_SYMBOLS        = QAbstractAspect \
 						 QPaintEngineEx \
 						 QQmlExtensionInterface \
 						 QTechniqueFilter \
-						 QBasicMutex
+						 QBasicMutex \
+						 QAbstractXmlReceiver
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
@@ -1922,7 +1923,7 @@ RTF_SOURCE_CODE        = NO
 # classes and files.
 # The default value is: NO.
 
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of

doc/autoupdater.dox

@@ -18,7 +18,7 @@ a gui and the Core-Library.
 */
 
 /*!
-@page image_page Image Page
+@page qtautoupdater_image_page Image Page
 
 @brief Shows sample images for the updater for all the supported platforms
 @tableofcontents

doc/updatebutton.dox

@@ -3,14 +3,14 @@
 
 The UpdateButton is a ready-made "button" to check for updates. It is connected to this
 controller and thus will automatically start checking for updates. Since the button itself
-shows a progress, no progress dialog is needed here. For images check the @ref image_page "Image Page".
+shows a progress, no progress dialog is needed here. For images check the @ref qtautoupdater_image_page "Image Page".
 
 The button will represent the controllers state and automatically enable/disable itself to
 avoid start beeing called twice. In addition to that, the whole button widget will be disabled
 if the controller gets deleted while the button is still existings. (Even if it wasn't,
 it will not crash if the button is clicked).
 
-@sa QtAutoUpdater::UpdateController, UpdateController::createUpdateAction, @ref image_page "Image Page"
+@sa QtAutoUpdater::UpdateController, UpdateController::createUpdateAction, @ref qtautoupdater_image_page "Image Page"
 */
 
 /*!
@@ -28,7 +28,7 @@ you can use this property to specify a different animation source.
 	@resetAc{resetAnimationFile()}
 }
 
-@sa @ref image_page "Image Page"
+@sa @ref qtautoupdater_image_page "Image Page"
 */
 
 /*!
@@ -48,7 +48,7 @@ In both cases, while the updater is running, the information will be shown as al
 	@writeAc{setShowResult()}
 }
 
-@sa @ref image_page "Image Page", UpdateButton::animationFile
+@sa @ref qtautoupdater_image_page "Image Page", UpdateButton::animationFile
 */
 
 /*!

doc/updatecontroller.dox

@@ -10,7 +10,7 @@ to do is starting this controller. This can be done in 4 ways:
  - Add the UpdateButton widget somewhere in your gui
 
 ## Images
-For a full collection of all immages, please go to the @ref image_page "Image Page"
+For a full collection of all immages, please go to the @ref qtautoupdater_image_page "Image Page"
 
 @sa QtAutoUpdater::Updater, QtAutoUpdater::UpdateButton
 */
@@ -23,7 +23,7 @@ the lowest (`AutomaticLevel = 0`) to the highest (`AskLevel = 5`). Each Level in
 levels with a smaller value, i.e. using the `AskLevel` will add the ask dialog to everything
 shown with `ProgressLevel`, but not less.
 
-@sa @ref image_page "Image Page"
+@sa @ref qtautoupdater_image_page "Image Page"
 */
 
 /*!
@@ -151,14 +151,14 @@ is used to switch between the two dialogs. If the DisplayLevel is set to not sho
 info-dialog at all, neither of the two will be shown.
 
 For a comparison how each of these dialogs looks on each platform, check the
-@ref image_page "Image Page".
+@ref qtautoupdater_image_page "Image Page".
 
 @accessors{
 	@readAc{isDetailedUpdateInfo()}
 	@notifyAc{setDetailedUpdateInfo()}
 }
 
-@sa UpdateController::DisplayLevel, @ref image_page "Image Page"
+@sa UpdateController::DisplayLevel, @ref qtautoupdater_image_page "Image Page"
 */
 
 /*!
@@ -229,13 +229,13 @@ This will crash your program in almost all cases!!!
 The action will automatically start the controller with the display-level
 `UpdateController::ProgressLevel`. In addition to that, the action will be automatically
 disabled if the controller is already running and deleted together with the controller
-(or `parent`, whoever gets destroyed first). For images check the @ref image_page "Image Page".
+(or `parent`, whoever gets destroyed first). For images check the @ref qtautoupdater_image_page "Image Page".
 
 The action has a text, an icon and a tooltip. On Mac, the action will be placed in the
 Applications menu if added to the Menubar. To show it in other places (for example as dock-menu),
 unset the QAction::menuRole.
 
-@sa QtAutoUpdater::UpdateButton, @ref image_page "Image Page", QAction::menuRole
+@sa QtAutoUpdater::UpdateButton, @ref qtautoupdater_image_page "Image Page", QAction::menuRole
 */
 
 /*!

examples/autoupdatercore/ConsoleUpdater/ConsoleUpdater.pro

@@ -3,7 +3,7 @@ TEMPLATE = app
 QT += core autoupdatercore
 QT -= gui
 
-CONFIG += c++11 console
+CONFIG += console
 CONFIG -= app_bundle
 
 TARGET = ConsoleUpdater
@@ -12,14 +12,3 @@ SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/autoupdatercore/ConsoleUpdater
 INSTALLS += target
-
-#not found by linker?
-unix:!mac {
-	LIBS += -L$$OUT_PWD/../../../lib #required to make this the first place to search
-	LIBS += -L$$[QT_INSTALL_LIBS] -licudata
-	LIBS += -L$$[QT_INSTALL_LIBS] -licui18n
-	LIBS += -L$$[QT_INSTALL_LIBS] -licuuc
-}
-
-#add lib dir to rpath
-mac: QMAKE_LFLAGS += '-Wl,-rpath,\'$$OUT_PWD/../../../lib\''