VERSION.cmake: 2.2.4 final

2026-04-03 09:11:33 +02:00 · 2016-09-27 10:53:37 +02:00
1256 changed files with 84012 additions and 209119 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,63 +0,0 @@
-# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
-#
-# You may use this file under the terms of the 3-clause BSD license.
-# See the file LICENSE from this package for details.
-
-# This is the clang-format configuration style to be used by Qt,
-# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
-# https://wiki.qt.io/Coding_Conventions
-
---
-# Webkit style was loosely based on the Qt style
-BasedOnStyle: WebKit
-
-Standard: Cpp11
-ColumnLimit: 0
-
-# Disable reflow of qdoc comments: indentation rules are different.
-# Translation comments are also excluded
-CommentPragmas: "^!|^:"
-
-# We want a space between the type and the star for pointer types
-PointerBindsToType: false
-
-# We want to break before the operators, but not before a '='
-BreakBeforeBinaryOperators: NonAssignment
-
-# Braces are usually attached, but not after functions or classes declaration
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: false
-    AfterFunction: true
-    AfterNamespace: false
-    AfterObjCDeclaration: false
-    AfterStruct: true
-    AfterUnion: false
-    BeforeCatch: false
-    BeforeElse: false
-    IndentBraces: false
-
-# The coding style does not specify the following, but this is what gives
-# results closest to the existing code.
-AlignAfterOpenBracket: DontAlign
-AlwaysBreakTemplateDeclarations: true
-
-# Ideally we should also allow less short function in a single line, but
-# clang-format does not handle that
-AllowShortFunctionsOnASingleLine: Inline
-
-# The coding style specifies some include order categories, but also tells to
-# separate categories with an empty line. It does not specify the order within
-# the categories. Since the SortInclude feature of clang-format does not
-# re-order includes separated by empty lines, the feature is not used.
-SortIncludes: false
-
-# macros for which the opening brace stays attached
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
-
-# Allow two empty lines for structuring
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,228 +0,0 @@
-clone:
-  git:
-    image: plugins/git
-    tags: true
-    depth: 1
-
-pipeline:
-    qt-5.7:
-        image: nextcloudci/client-5.7:client-5.7-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              source /opt/qt57/bin/qt57-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              source /opt/qt57/bin/qt57-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.7
-    qt-5.8:
-        image: nextcloudci/client-5.8:client-5.8-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              source /opt/qt58/bin/qt58-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              source /opt/qt58/bin/qt58-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.8
-    qt-5.9:
-        image: nextcloudci/client-5.9:client-5.9-4
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              source /opt/qt59/bin/qt59-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              source /opt/qt59/bin/qt59-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.9
-    qt-5.10:
-        image: nextcloudci/client-5.10:client-5.10-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt510/bin/qt510-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt510/bin/qt510-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.10
-    qt-5.11:
-        image: nextcloudci/client-5.11:client-5.11-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              export CC=gcc-7 &&
-              export CXX=g++-7 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.11
-
-    qt-5.11-clang:
-        image: nextcloudci/client-5.11:client-5.11-3
-        commands:
-            # Install QtKeyChain
-            - /bin/bash -c "
-              export CC=clang-6.0 &&
-              export CXX=clang++-6.0 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              cd /tmp &&
-              git clone https://github.com/frankosterfeld/qtkeychain.git &&
-              cd qtkeychain &&
-              git checkout v0.8.0 &&
-              mkdir build &&
-              cd build &&
-              cmake ../ &&
-              make &&
-              make install"
-            # Build client
-            - /bin/bash -c "
-              export CC=clang-6.0 &&
-              export CXX=clang++-6.0 &&
-              source /opt/qt511/bin/qt511-env.sh &&
-              mkdir build &&
-              cd build &&
-              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-              make &&
-              useradd -m -s /bin/bash test &&
-              chown -R test:test . &&
-              su -c 'ctest --output-on-failure' test"
-        when:
-            matrix:
-                TESTS: qt-5.11-clang
-
-    AppImage:
-        image: nextcloudci/client-5.11:client-5.11-3
-        commands:
-            - /bin/bash -c "./admin/linux/build-appimage.sh"
-        when:
-            matrix:
-                BUILD: AppImage
-
-    Debian:
-        image: nextcloudci/client-debian-ci:client-debian-ci-2
-        commands:
-            - /bin/bash -c "./admin/linux/debian/drone-build.sh"
-        secrets: [ DEBIAN_SECRET_KEY, DEBIAN_SECRET_IV ]
-        when:
-            matrix:
-                BUILD: Debian
-
-    documentation:
-        image: nextcloudci/documentation:documentation-5
-        commands:
-            - cd doc
-            - make html
-        when:
-            matrix:
-                TESTS: documentation
-
-matrix:
-    include:
-        - TESTS: qt-5.7
-        - TESTS: qt-5.8
-        - TESTS: qt-5.9
-        - TESTS: qt-5.10
-        - TESTS: qt-5.11
-        - TESTS: qt-5.11-clang
-        - BUILD: AppImage
-        - BUILD: Debian
-        - TESTS: documentation
-
-branches: [ master, 2.* ]
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1 +0,0 @@
-c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "doc/ocdoc"]
+	path = doc/ocdoc
+	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
 	url = https://github.com/guruz/qtmacgoodies.git
@@ -7,3 +10,6 @@
 [submodule "src/3rdparty/libcrashreporter-qt"]
 	path = src/3rdparty/libcrashreporter-qt
 	url = git://github.com/dschmidt/libcrashreporter-qt.git
+[submodule "src/3rdparty/qtkeychain"]
+	path = src/3rdparty/qtkeychain
+	url = https://github.com/frankosterfeld/qtkeychain.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,37 @@
+sudo: required
+
+language: cpp
+
+services:
+  - docker
+
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get -y build-dep owncloud-client
+- checkout=$(git show-ref --head --hash head)
+- cd ../
+- wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
+- mkdir coverity
+- tar -xvf coverity_tool.tgz -C coverity --strip-components=1
+- export PATH=$PATH:$PWD/coverity/bin/
+- cd $TRAVIS_BUILD_DIR
+
+install:
+- cd ../
+- mkdir client-build
+- cd client-build
+- cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
+- cov-build --dir cov-int make
+- tar czvf client.tgz cov-int 
+- curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
+
+# Hack to stop processing
+script: true
--- a/.tx/config
+++ b/.tx/config
@@ -1,16 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = bg_BG: bg, cs_CZ: cs, de_DE: de, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, pt_PT: pt, et_EE: et
-
-[nextcloud.client]
-host = https://www.transifex.com
-source_lang = en
-source_file = translations/client_en.ts
-file_filter = translations/client_<lang>.ts
-type = QT
-
-[nextcloud.client-desktop]
-host = https://www.transifex.com
-source_file = mirall.desktop.in
-source_lang = en
-type = DESKTOP
--- a/.tx/nextcloud.client-desktop/cs_translation
+++ b/.tx/nextcloud.client-desktop/cs_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
-Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
-Name[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
-GenericName[cs_CZ]=Synchronizace složek
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-Icon[de_DE]=@APPLICATION_EXECUTABLE@
-Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-GenericName[de_DE]=Synchronisationsordner
--- a/.tx/nextcloud.client-desktop/en_GB_translation
+++ b/.tx/nextcloud.client-desktop/en_GB_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
-Icon[en_GB]=@APPLICATION_EXECUTABLE@
-Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
-GenericName[en_GB]=Folder Sync
--- a/.tx/nextcloud.client-desktop/es_CL_translation
+++ b/.tx/nextcloud.client-desktop/es_CL_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CL]=@APPLICATION_EXECUTABLE@
-Name[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CL]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_CO_translation
+++ b/.tx/nextcloud.client-desktop/es_CO_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CO]=@APPLICATION_EXECUTABLE@
-Name[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CO]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_CR_translation
+++ b/.tx/nextcloud.client-desktop/es_CR_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CR]=@APPLICATION_EXECUTABLE@
-Name[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CR]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_DO_translation
+++ b/.tx/nextcloud.client-desktop/es_DO_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_DO]=@APPLICATION_EXECUTABLE@
-Name[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_DO]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_EC_translation
+++ b/.tx/nextcloud.client-desktop/es_EC_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_EC]=@APPLICATION_EXECUTABLE@
-Name[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_EC]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_GT_translation
+++ b/.tx/nextcloud.client-desktop/es_GT_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_GT]=@APPLICATION_EXECUTABLE@
-Name[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_GT]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_MX_translation
+++ b/.tx/nextcloud.client-desktop/es_MX_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_MX]=@APPLICATION_EXECUTABLE@
-Name[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_MX]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_SV_translation
+++ b/.tx/nextcloud.client-desktop/es_SV_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_SV]=@APPLICATION_EXECUTABLE@
-Name[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_SV]=Sincronización de carpeta
--- a/.tx/nextcloud.client-desktop/es_translation
+++ b/.tx/nextcloud.client-desktop/es_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
-Icon[es]=@APPLICATION_EXECUTABLE@
-Name[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
-GenericName[es]=Sincronización de carpetas
--- a/.tx/nextcloud.client-desktop/fr_translation
+++ b/.tx/nextcloud.client-desktop/fr_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[fr]=Client  desktop de synchronisation @APPLICATION_NAME@
-Icon[fr]=@APPLICATION_EXECUTABLE@
-Name[fr]=Client  desktop de synchronisation @APPLICATION_NAME@
-GenericName[fr]=Synchronisation du dossier
--- a/.tx/nextcloud.client-desktop/he_translation
+++ b/.tx/nextcloud.client-desktop/he_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
-Icon[he]=@APPLICATION_EXECUTABLE@
-Name[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה 
-GenericName[he]=סנכרון תיקיות
--- a/.tx/nextcloud.client-desktop/hr_translation
+++ b/.tx/nextcloud.client-desktop/hr_translation
@@ -1,203 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[hr]=klijent za sinkronizaciju računala
-Name[hr]=sinkronizacija računala
-GenericName[hr]=Sinkronizacija mapa
--- a/.tx/nextcloud.client-desktop/is_translation
+++ b/.tx/nextcloud.client-desktop/is_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
-Icon[is]=@APPLICATION_EXECUTABLE@
-Name[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
-GenericName[is]=Samstilling á möppum
--- a/.tx/nextcloud.client-desktop/it_translation
+++ b/.tx/nextcloud.client-desktop/it_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
-Icon[it]=@APPLICATION_EXECUTABLE@
-Name[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
-GenericName[it]=Sincronizzazione cartelle
--- a/.tx/nextcloud.client-desktop/ja_translation
+++ b/.tx/nextcloud.client-desktop/ja_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-Icon[ja_JP]=@APPLICATION_EXECUTABLE@
-Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダーを同期する
--- a/.tx/nextcloud.client-desktop/pt_BR_translation
+++ b/.tx/nextcloud.client-desktop/pt_BR_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
-Icon[pt_BR]=@APPLICATION_EXECUTABLE@
-Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
-GenericName[pt_BR]=Sincronizar Pasta
--- a/.tx/nextcloud.client-desktop/ru_translation
+++ b/.tx/nextcloud.client-desktop/ru_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
-Icon[ru]=@APPLICATION_EXECUTABLE@
-Name[ru]=@APPLICATION_NAME@  клиент для ПК
-GenericName[ru]=Синхронизация папок
--- a/.tx/nextcloud.client-desktop/sr_translation
+++ b/.tx/nextcloud.client-desktop/sr_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
-Icon[sr]=@APPLICATION_EXECUTABLE@
-Name[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
-GenericName[sr]=Синхронизација фасцикли
--- a/.tx/nextcloud.client-desktop/tr_translation
+++ b/.tx/nextcloud.client-desktop/tr_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-Icon[tr]=@APPLICATION_EXECUTABLE@
-Name[tr]=@APPLICATION_NAME@ masaüstü eşiteme istemcisi
-GenericName[tr]=Klasör Eşitleme
--- a/.tx/nextcloud.client-desktop/zh_TW_translation
+++ b/.tx/nextcloud.client-desktop/zh_TW_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-Icon[zh_TW]=@APPLICATION_EXECUTABLE@
-Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-GenericName[zh_TW]=資料夾同步
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,14 @@
-cmake_minimum_required(VERSION 3.2)
-set(CMAKE_CXX_STANDARD 14)
+
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.8.0)

 project(client)

-set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
 set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake )
+     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()
 # need this logic to not mess with re/uninstallations via macosx.pkgproj
 if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
@@ -18,19 +17,16 @@ else()
    set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
 endif()

+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
+endif()
+
 # For usage in XML files we preprocess
 string(REPLACE "&" "&amp;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
 string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
 string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")

-if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
-    set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
-endif()
-
-if (NOT DEFINED PACKAGE)
-    set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
-endif()
-
+set(PACKAGE "${APPLICATION_SHORTNAME}-client")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )

 if(NOT CRASHREPORTER_EXECUTABLE)
@@ -40,13 +36,7 @@ endif()
 include(Warnings)

 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-# For config.h
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-# Allows includes based on src/ like #include "common/utility.h" or #include "csync/csync.h"
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}/src
-)

 # disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
 if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
@@ -57,24 +47,26 @@ if(NOT WITH_CRASHREPORTER)
    message(STATUS "Build of crashreporter disabled.")
 endif()

+#####
+## handle DBUS for Fdo notifications
+if( UNIX AND NOT APPLE )
+    add_definitions( -DUSE_FDO_NOTIFICATIONS)
+    set(WITH_DBUS ON)
+endif()
+####
+
 include(GNUInstallDirs)
 include(DefineInstallationPaths)
-include(GenerateExportHeader)
+

 include(GetGitRevisionDescription)

 get_git_head_revision(GIT_REFSPEC GIT_SHA1)

-add_definitions(
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
-    -DQT_DEPRECATED_WARNINGS
-)
-
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
+if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
    if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
@@ -123,22 +115,7 @@ if(NO_MSG_HANDLER)
   add_definitions(-DNO_MSG_HANDLER=1)
 endif()

-# this option builds the shell integration
-option(BUILD_SHELL_INTEGRATION "BUILD_SHELL_INTEGRATION" ON)
-
-# this option builds/installs the generic shell integration icons
-option(BUILD_SHELL_INTEGRATION_ICONS "BUILD_SHELL_INTEGRATION_ICONS" ON)
-
-# this options builds the dolphin integration plugin
-option(BUILD_SHELL_INTEGRATION_DOLPHIN "BUILD_SHELL_INTEGRATION_DOLPHIN" ON)
-
-# this options builds the nautilus (like) integration plugins
-option(BUILD_SHELL_INTEGRATION_NAUTILUS "BUILD_SHELL_INTEGRATION_NAUTILUS" ON)
-
-# this option builds the client
-option(BUILD_CLIENT "BUILD_CLIENT" ON)
-
-# this option creates only libocsync and libowncloudsync (NOTE: BUILD_CLIENT needs to be on)
+# this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)

 # When this option is enabled, 5xx errors are not added to the blacklist
@@ -159,77 +136,57 @@ if(OWNCLOUD_RESTORE_RENAME)
    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
 endif()

-# Disable shibboleth.
-# So the client can be built without QtWebKit
-option(NO_SHIBBOLETH "Build without Shibboleth support. Allow to build the client without QtWebKit" OFF)
-if(NO_SHIBBOLETH)
-   message("Compiling without shibboleth")
-   add_definitions(-DNO_SHIBBOLETH=1)
-endif()

 if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()

-if(BUILD_CLIENT)
-    if(APPLE)
-        find_package(Sparkle)
-    endif(APPLE)
+find_package(OpenSSL 1.0.0 REQUIRED)

-    if(UNIX)
-        find_package(INotify REQUIRED)
-    else()
-        find_package(INotify)
-    endif()
-    find_package(Sphinx)
-    find_package(PdfLatex)
-    find_package(OpenSSL REQUIRED VERSION 1.1)
+if(APPLE)
+  find_package(Sparkle)
+endif(APPLE)

-   find_package(ZLIB REQUIRED)
-   find_package(GLib2)
-   find_package(Gio)
-   find_package(Libcloudproviders)
+if(UNIX)
+  find_package(INotify REQUIRED)
+else()
+  find_package(INotify)
+endif()
+find_package(Sphinx)
+find_package(PdfLatex)
+
+find_package(SQLite3 3.8.0 REQUIRED)
+# On some OS, we want to use our own, not the system sqlite
+if (USE_OUR_OWN_SQLITE3)
+    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
 endif()

-if (NOT DEFINED APPLICATION_ICON_NAME)
-    set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
-endif()
+find_package(ZLIB)

-include(NextcloudCPack.cmake)
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
+
+include(OwnCloudCPack.cmake)

 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 if( WIN32 )
 add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
-add_definitions( -DNOMINMAX )
-# Get APIs from from Vista onwards.
-add_definitions( -D_WIN32_WINNT=0x0600)
-add_definitions( -DWINVER=0x0600)
 endif( WIN32 )

-if (APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-endif()
-
 # Handle Translations, pick all client_* files from trans directory.
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})

-if(BUILD_CLIENT)
-    add_subdirectory(src)
-    if(NOT BUILD_LIBRARIES_ONLY)
-        add_subdirectory(man)
-        add_subdirectory(doc)
-        add_subdirectory(doc/dev)
-        if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-            add_subdirectory(admin)
-        endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-    endif(NOT BUILD_LIBRARIES_ONLY)
-endif()
-
-if(BUILD_SHELL_INTEGRATION)
-    add_subdirectory(shell_integration)
-endif()
+add_subdirectory(csync)
+add_subdirectory(src)
+if(NOT BUILD_LIBRARIES_ONLY)
+add_subdirectory(shell_integration)
+add_subdirectory(doc)
+add_subdirectory(doc/dev)
+add_subdirectory(admin)
+endif(NOT BUILD_LIBRARIES_ONLY)

 if(UNIT_TESTING)
    include(CTest)
@@ -237,13 +194,10 @@ if(UNIT_TESTING)
    add_subdirectory(test)
 endif(UNIT_TESTING)

-configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
    install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
    configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
-elseif(BUILD_CLIENT)
+else()
    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,18 +1,20 @@
 ## Submitting Desktop Client issues

-If you have questions about how to use the Nextcloud Desktop Client, please
-visit our [support site][support] or our [forum][forum].
+If you have questions about how to use the ownCloud Desktop Client, please
+direct these to the [mailing list][mailinglist] or our [forum][forum].
 We are also available on [IRC][irc].

 ### Bug Reporting Guidelines
 * __Important__: Report the issue using our [template][template], it includes all the
  information we need to track down the issue.  
-* __SECURITY__: Report any potential security bug by following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker
-* This repository is *only* for issues within the Nextcloud desktop client. 
+* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
+* This repository is *only* for issues within the ownCloud desktop client. 
  Issues in other components should be reported in their own repositores: 
-  - [Nextcloud server](https://github.com/nextcloud/server/issues)
-  - [Android client](https://github.com/nextcloud/android/issues)
-  - [iOS client](https://github.com/nextcloud/ios/issues)
+  - [ownCloud server](https://github.com/owncloud/core/issues)
+  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
+    Contacts...)
+  - [Android client](https://github.com/owncloud/android/issues)
+  - [iOS client](https://github.com/owncloud/ios-issues/issues)
 * Search the existing issues first, it's likely that your issue was already
  reported.

@@ -21,20 +23,27 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.

-[template]: https://raw.githubusercontent.com/nextcloud/appstore/master/.github/issue_template.md
-[support]: https://nextcloud.com/support/
-[forum]: https://help.nextcloud.com/categories
-[irc]: https://webchat.freenode.net/?channels=nextcloud
+[template]: https://raw.github.com/owncloud/client/master/issue_template.md
+[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
+[forum]: http://forum.owncloud.org/
+[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4

 ## Contributing to Source Code

-Thanks for wanting to contribute source code to Nextcloud. That's great!
+Thanks for wanting to contribute source code to ownCloud. That's great!

-You do not need to sign a Contributor Agreement, but we ask that you follow our 
-[Code of Conduct](https://nextcloud.com/code-of-conduct/).
+Before we're able to merge your code to ownCloud Desktop Client, you need to sign
+our [Contributor Agreement][agreement].

-Please read the [Contribution Guide](https://nextcloud.com/contribute/) to get 
-started.
+Please read the [Desktop Client Manual][desktopman] and the [Developer
+Manuals][devmanual] to get useful info like how to create your first
+application or how to test the ownCloud code with phpunit.
+
+[agreement]: http://owncloud.org/about/contributor-agreement/
+[devmanual]: http://owncloud.org/dev
+[desktopman]: http://doc.owncloud.org/desktop

 ## Translations
-Please submit translations via [Transifex](https://www.transifex.com/nextcloud/nextcloud/).
+Please submit translations via [Transifex][transifex].
+
+[transifex]: https://www.transifex.com/projects/p/owncloud/
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -14,7 +14,7 @@ set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()

 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
--- a/197
+++ b/197
@@ -1,189 +1,6 @@
 ChangeLog
 =========

-version 2.4.1 (2017-02-xx)
-* Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
-* Issues: Speed up insertion and add hard upper limit (#6272)
-* Notifications: Fix "Dismiss" action
-* Notifications: Fix timer invocation on macOS
-* Notifications: Immediately poll when account online
-* Protocol: Remove entries for auto resolved conflicts (#6316)
-* owncloudcmd: Set proxy before capabilities call (#6281)
-* owncloudcmd: Do not do the capability call when --nonshib is passed
-* Avatars: Use old location for servers <10 (#6279)
-* Link shares: Change default share name (#6298)
-* Nautilus integration: Work with python2 and python3
-* HTTP2: Only allow with Qt 5.9.4 (#6285)
-* Crash fixes
-
-version 2.4.0 (2017-12-21)
-* If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
-* OAuth2 authentication support by opening external browser (#5668)
-* Shibboleth: Change to use OAuth2 if supported (#6198)
-* Sharing: Add support for multiple public link shares (#5655)
-* Sharing: Add option to copy/email private links (#5023, #5627)
-* Sharing: Add option "show file listing" (#5837)
-* Sharing: Show warning that links are public (#5747)
-* Sharing: Sharing dialog redesign: multiple share links support (#5695)
-* Sharing: Make "can edit" partially checked sometimes (#5642)
-* Sharing: Trigger a sync for folder affected by a change of sharing (#6098)
-* Wizard: Never propose an existing folder for syncing (#5597)
-* Wizard: Don't show last page anymore, go to settings directly (#5726)
-* Wizard: Handle url-shortener redirects (#5954)
-* Wizard: Resolve url/ redirects only if url/status.php not found (#5954)
-* Wizard: Add explanation text when server error is shown (#6157)
-* Wizard: Update the window size on high dpi screen (#6156)
-* Wizard: Don't report confusing error message (#6116)
-* Gui: Display the user server avatar (#5482)
-* Gui: Use display name of user, not internal name
-* Server URL: Update configuration in case of permanent redirection (#5972)
-* Gui: Allow to add multiple sync folder connection of the same folder (#6032)
-* Tray Menu: More detailed status messages
-* Tray Menu: Shibboleth: raise the browser when clicking on the tray (#6105)
-* Activity: Link errors from the account tab, allow filtering by account/folder (#5861)
-* Activity: Present conflicts more prominently (#5894)
-* Activity: Allow sorting the columns in issues and protocol tabs (#6093, #6086)
-* Selective Sync: Open sub folder context menu (#5596)
-* Selective Sync: Skip excluded folders when reading db (#5772)
-* Selective Sync: Remove local files of unselected folder despite other modified files (#5783)
-* Excludes: Remove .htaccess form list of excluded files (#5701)
-* Excludes: Hardcode desktop.ini
-* Excludes: Allow escaping "#" (#6012)
-* Excludes: Use faster matching via QRegularExpression (#6063)
-* Discovery: Increase the MAX_DEPTH and show deep folders as ignored (#1067)
-* Discovery: General speed improvements
-* Downloads: Remove empty temporary if disk space full (#5746)
-* Downloads: Read Content-MD5 header for object store setups
-* Checksums: Add global disable environment variable (#5017)
-* Quota: PropagateUpload: Model of remote quota, avoid some uploads (#5537)
-* Create favorite also in folder wizard (#455)
-* Windows: Use the application icon for the Windows 8 sidebar favorite (#2446, #5690)
-* macOS: Finder sidebar icon (#296)
-* Overlay Icons: Consider also the "shared by me" as shared (#4788)
-* Overlay Icons: Update right after sharing (#6115)
-* Overlay Icons: Fix different case paths not matching (#5257)
-* Overlay Icons: Detect changes in the shared flag (#6098)
-* Windows Overlay Icons: Potential hang fixes
-* Linux Overlay Icons: fix branded nemo and caja shell integration (#5966)
-* Credentials: Fix behavior for bad password (#5989)
-* Credentials: Don't create empty client cert keychain entries (#5752)
-* Credentials: Namespace windows cred keys (#6125)
-* Credentials: Use per-account keychain entries (#5830, #6126)
-* AccountSettings: Triggering log in re-ask about previously rejected certificates (#5819)
-* owncloudcmd: Added bandwidth limit parameter (#5707)
-* owncloudcmd: Fix timestamps, Fix --logdebug
-* AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
-* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance (#5852)
-* Sync: Introduce overall errors that are not tied to a file (#5746)
-* Sync: Better messaging for 507 Insufficient Storage (#5537)
-* Sync: Create conflicts by comparing the hash of files with identical mtime/size (#5589)
-* Sync: Avoid downloads by comparing the hash of files with identical mtime/size (#6153)
-* Sync: Upload conflict files if OWNCLOUD_UPLOAD_CONFLICT_FILES environment variable is set (#6038)
-* Sync: Blacklist: Don't let errors become warnings (#5516)
-* Sync: Check etag again after active sync (#4116)
-* Sync: Rename handling fixes: duplicate file ids (#6096, #6212)
-* Sync: Rename handling fixes: File size must be equal
-* Sync: Rename handling: Fix duplicate files on abort/resume sync (#5949)
-* Sync: Add capability for invalid filename regexes (#6092)
-* SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723)
-* SyncJournalDB: Don't crash if the db file is readonly (#6050)
-* SyncJournalDB: DB close error is not fatal
-* Fix at least one memory leak
-* Documentation improvements
-* Logging improvements (With Qt logging categories) (#5671)
-* Logging filtering per account (#5672)
-* Crash fixes
-* Test improvements
-* Small UI layout fixes
-* Performance improvements
-* Maintenance Mode: Detect maintenance mode (#4485)
-* Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872)
-* HTTP: Send a unique X-Request-ID with each request (#5853)
-* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x) (#5659)
-* owncloudcmd: Don't start if connection or auth fails (#5692)
-* csync: Switch build from C to C++ (#6033)
-* csync: Refactor a lot to use common data structures to save memory and memory copying
-* csync: Switch some data structures to Qt data structures
-* csync: Switch to using upper layer SyncJournalDB (#6087)
-* Switch 3rdparty/json usage to Qt5's QJson (#5710)
-* OpenSSL: Don't require directly, only via Qt (#5833)
-* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS) (#5875)
-* Compilation: Remove Qt 4 code (#6025, #5702, #5505)
-* Harmonize source code style with clang-format (#5732)
-* Switch over to Qt 5 function pointer signal/slot syntax (#6041)
-* Compile with stack-smashing protection
-* Updater: Rudimentary support for beta channel (#6048)
-
-version 2.3.4 (2017-11-02)
-* Checksums: Use addData function to avoid endless loop CPU load issues with Office files
-* Packaging: Require ZLIB
-
-version 2.3.3 (2017-08-29)
-* Chunking NG: Don't use old chunking on new DAV endpoint (#5855)
-* Selective Sync: Skip excluded folders when reading DB, don't let them show errors (#5772)
-* Settings: Make window bigger so Qt version is always visible (#5760)
-* Share links: Show warning that public link shares are public (#5786)
-* Downloads: Re-trigger folder discovery on HTTP 404 (#5799)
-* Overlay Icons: Fix potential hangs on Windows
-* SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
-* SyncJournalDB: Log reason for sqlite3 opening errors
-* Notifications: Proapgate "Dismiss" button action to server (#5922)
-* Switch Linux build also to Qt 5.6.2 (#5470)
-* Stopped maintaining Qt 4 buildability
-
-version 2.3.2 (2017-05-08)
-* Fix more crashes (thanks to everyone submitting to our crash reporter!)
-* Improve compatibility with server 10.0 (#5691, X-OC-Total-Size)
-* Share dialog: UI improvements, Bring to front on tray click
-* owncloudcmd: Align process return value with sync return value (#3936)
-* Fix disk free check on Windows when opening the local DB
-
-version 2.3.1 (2017-03-21)
-* Fix several crashes (thanks to everyone submitting to our crash reporter!)
-* Improve HTTP redirect handling (#5555)
-* Blacklist: Escalate repeated soft error to normal error (#5500)
-* NTFS: Do not attempt to upload two existing files with similar casing (#5544)
-* Fix URL for linking to application password generation for ownCloud 10.0 (#5605)
-
-version 2.3.0 (2017-03-03)
-* Decreased memory usage during sync
-* Overlay icons: Lower CPU usage
-* Allow to not sync the server's external storages by default
-* Switch Windows and OS X build to Qt 5.6.2
-* Switch to new ownCloud server WebDAV endpoint
-* Chunking NG: New file upload chunking algorithmn for ownCloud server 9.2
-* Allow to sync a folder to multiple different servers (Filename change from .csync_journal.db to _sync_$HASH.db)
-* Conflicts: Use the local mtime for the conflict file name (#5273)
-* "Sync now" menu item
-* SSL Client certificate support improved (Show UI, Store keys in keychain)
-* Propagator: Upload more small files in parallel
-* Sync Engine: Read data-fingerprint property to detect backups (#2325)
-* GUI: Show link to ceate an app password/token for syncing
-* Share dialog: Add 'Mail link' button
-* Caja file manager plugin
-* Make "backup detected" message to not trigger in wrong cases
-* SyncEngine: Fix renaming of folder when file are changed (#5192)
-* Fix reconnect bug if status.php intermittently returns wrong data (#5188)
-* Improve sync scheduling (#5317)
-* Overlay icons: Improvements in correctnes
-* Tray menu: Only update on demand to fix Linux desktop integration glitches
-* Progress: Better time/bandwidth estimations
-* Network: Follow certain HTTP redirects (#2791)
-* Network: Remove all cookies (including load balancers etc) when logging out
-* Discovery thread: Low priority
-* owncloudsync.log: Write during propagation
-* Better error message for files with trailing spaces on Windows
-* Excludes: Consider files in hidden folders excluded (#5163)
-* Allow sync directory to be a symlinked directory
-* Add manifest file on Windows to make the application UAC aware
-* macOS: Improve monochrome tray icons
-* Shibboleth bugfixes
-* Fixes with regards to low disk space
-* A ton of other bugfixes
-* Refactorings
-* Improved documentation
-* Crash fixes
-
 version 2.2.4 (release 2016-09-27)
 * Dolphin Plugin: Use the Application name for the socket path (#5172)
 * SyncEngine: Fix renaming of folder when file are changed (#5195)
@@ -219,7 +36,7 @@ version 2.2.2 (release 2016-06-21)
 version 2.2.1 (release 2016-06-06)
 * Fix out of memory error when too many uploads happen (#4611)
 * Fix display errors in progress display (#4803 #4856)
- * LockWatcher: Remember to upload files after they become unlocked (#4865)
+ * LockWatcher: Remember to upload files after they become unlocked (#4865) 
 * Fix overlay icons for files with umlauts (#4884)
 * Certs: Re-ask for different cert after rejection (#4898, #4911)
 * Progress: Don't count items without propagation jobs (#4856, #4910)
@@ -245,6 +62,7 @@ version 2.2.0 (release 2016-05-12)
 * Documentation Improvements, ie. about overlay icons
 * Translation fixes
 * Countless other bugfixes
+ * Sqlite Update to recent version
 * Update of QtKeyChain to support Windows credential store
 * Packaging of dolphin overlay icon module for bleeding edge distros

@@ -276,7 +94,7 @@ version 2.1 (release 2015-12-03)
 * GUI: Improved upload/download progress UI (#3403, #3569)
 * Allowed sharing with ownCloud internal users and groups from Desktop
 * Changed files starting in .* to be considered hidden on all platforms (#4023)
- * Reflect read-only permissions in filesystem (#3244)
+ * Reflect read-only permissions in filesystem (#3244)  
 * Blacklist: Clear on successful chunk upload (#3934)
 * Improved reconnecting after network change/disconnect (#4167 #3969 ...)
 * Improved performance in Windows file system discovery
@@ -315,6 +133,7 @@ version 2.1 (release 2015-12-03)
 * Fixed getting size for selective sync (#3986)
 * Re-added close button in the settings window (#3713)
 * Added abililty to handle storage limitations gracefully (#3736)
+ * Updated 3rdparty dependencies: sqlite version 3.9.1
 * Organized patches to our base Qt version into admin/qt/patches
 * Plus: A lot of unmentioned improvements and fixes

@@ -350,7 +169,7 @@ version 2.0.2 (release 2015-10-21)
  * ShareDialog: Fix folder display (#3659)
  * AccountSettings: Restore from legacy only once (#3565)
  * SSL Certificate Error Dialog: show account name (#3729)
-  * Tray notification: Don't show a message about modified folder (#3613)
+  * Tray notification: Don't show a message about modified folder (#3613) 
  * PropagateLocalRemove:  remove entries from the DB even if there was an error.
  * Settings UI improvements (eg. #3713, #3721, #3619 and others)
  * Folder: Do not create the sync folder if it does not exist (#3692)
@@ -981,7 +800,7 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required
               directory, away from the .csync dir.
  *         Renamed exclude.lst to sync-exclude.lst and moved it to
            /etc/appName()/ for more clean packaging. From the user path,
-            still exclude.lst is read if sync-exclude.lst is not existing.
+	    still exclude.lst is read if sync-exclude.lst is not existing.
  *         Placed custom.ini with customization options to /etc/appName()

 version 1.0.5 (release 2012-08-14), csync 0.50.8 required
@@ -1001,8 +820,8 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
  * [GUI] Proxy configuration dialog added.
  * [GUI] Added Translations to languages Slovenian, Polish, Catalan,
          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
-          French, Russian, Japanese, Swedish, Portuguese (Portugal)
-          all with translation rate >90%.
+	  French, Russian, Japanese, Swedish, Portuguese (Portugal)
+	  all with translation rate >90%.
  * [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
  * [Fixes] Win32: Handle SSL dll loading correctly.
  * [Fixes] Many other small fixes and improvements.
--- a/58
+++ b/58
@@ -0,0 +1,58 @@
+#!groovy
+
+node('CLIENT') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'Qt4'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt4 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt5 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
+		ctest --output-on-failure'''
+
+
+    stage 'Win32'
+	def win32 = docker.image('deepdiver/docker-owncloud-client-win32:latest')
+	win32.pull() // make sure we have the latest available from Docker Hub
+	win32.inside {
+		sh '''
+		rm -rf build-win32
+		mkdir build-win32
+		cd build-win32
+		../admin/win/download_runtimes.sh
+		cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
+		make -j4
+		make package
+		ctest .
+		'''
+	}
+}
+
+
--- a/NEXTCLOUD.cmake
+++ b/NEXTCLOUD.cmake
@@ -1,24 +0,0 @@
-set( APPLICATION_NAME       "Nextcloud" )
-set( APPLICATION_SHORTNAME  "Nextcloud" )
-set( APPLICATION_EXECUTABLE "nextcloud" )
-set( APPLICATION_DOMAIN     "nextcloud.com" )
-set( APPLICATION_VENDOR     "Nextcloud GmbH" )
-set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" )
-set( APPLICATION_ICON_NAME  "Nextcloud" )
-
-set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
-
-set( THEME_CLASS            "NextcloudTheme" )
-set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
-set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
-
-set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
-
-# set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
-# set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
-
-option( WITH_CRASHREPORTER "Build crashreporter" OFF )
-#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
-#set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
-
-option( WITH_PROVIDERS "Build with providers list" OFF )
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -0,0 +1,18 @@
+set( APPLICATION_NAME       "ownCloud" )
+set( APPLICATION_EXECUTABLE "owncloud" )
+set( APPLICATION_DOMAIN     "owncloud.com" )
+set( APPLICATION_VENDOR     "ownCloud" )
+set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
+
+set( THEME_CLASS            "ownCloudTheme" )
+set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
+set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
+
+set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
+
+# set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
+# set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
+
+option( WITH_CRASHREPORTER "Build crashreporter" OFF )
+set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
--- a/NextcloudCPack.cmake
+++ b/NextcloudCPack.cmake
@@ -5,7 +5,7 @@ set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( "${OEM_THEME_DIR}/OEM.cmake" )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()

 include( VERSION.cmake )
@@ -48,7 +48,7 @@ if(WIN32)
    set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
    # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
-    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\${APPLICATION_SHORTNAME}
+    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\fellody
    set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} )  # Registry key used when installing this project  CMake 2.5.0
    set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
--- a/README.md
+++ b/README.md
@@ -1,94 +1,65 @@
-# Nextcloud Desktop Client
+# ownCloud Desktop Client

-The :computer: Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server
+| Job                               | State                                                                                                                                                             |
+|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| client-build-matrix               | [![Build Status](https://ci.owncloud.org/job/client-build-matrix-linux/badge/icon)](https://ci.owncloud.org/job/client-build-matrix-linux/)                       |
+| client-test-matrix-linux-no-build | [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=client-test-matrix-linux-no-build)](https://ci.owncloud.org/job/client-test-matrix-linux-no-build/) |
+| coverity_scan | [![Build Status](https://img.shields.io/coverity/scan/2482.svg)](https://scan.coverity.com/projects/owncloud-mirall)
+
+## Introduction
+
+The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
 with your computer.

-<p align="center">
-    <img src="https://nextcloud.com/wp-content/themes/next/assets/img/clients/desktop/macsettings.png?x16328" alt="Desktop Client on Mac OS]">
-</p>
+## Download

-## :blue_heart: :tada: Contributing
+### Binary packages

-### :hammer_and_wrench: How to compile the desktop client
+* Refer to the download page https://owncloud.org/install/#install-clients

-:building_construction: [System requirements](https://github.com/nextcloud/desktop/wiki/System-requirements-for-compiling-the-desktop-client) includes OpenSSL 1.1.x, QtKeychain, Qt 5.x.x and zlib.
+### Source code

-#### :memo: Step by step instructions
-
-##### Clone the repo and create build directory
-```
-$ git clone git@github.com:nextcloud/desktop.git
-$ cd desktop
-$ mkdir build
-```
-##### Compile and install
-
-##### Linux
-
-```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
-$ make install
-```
-
-##### Windows
-
-```
-$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
-$ cmake --build . --config Debug --target install
-```
-
-##### Mac OS
-
-```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
-$ make install
-```
-
-More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki).
-
-### :inbox_tray: Where to find binaries to download
-
-#### :high_brightness: Daily builds
-
- Daily builds based on the latest master are available for Linux :penguin:, Mac, and Windows
-[in the desktop/daily folder of our download server](https://download.nextcloud.com/desktop/daily).
-For more info: [Wiki/Daily Builds](https://github.com/nextcloud/desktop/wiki/Daily-Builds).
-
-#### :rocket: Releases
-
- Refer to the [download page https://nextcloud.com/install/#install-clients](https://nextcloud.com/install/#install-clients)
-
-### :bomb: Reporting issues
-
- If you find any bugs or have any suggestion for improvement, please
-file an issue at https://github.com/nextcloud/client/issues. Do not
-contact the authors directly by mail, as this increases the chance
-of your report being lost. :boom:
-
-### :smiley: :trophy: Pull requests
-
- If you created a patch :heart_eyes:, please submit a [Pull
-Request](https://github.com/nextcloud/client/pulls).
-
-## :satellite: Contact us
-
-If you want to contact us, e.g. before starting a more complex feature, for questions :question:
-you can join us at
-[#nextcloud-client](https://webchat.freenode.net/?channels=nextcloud-client).
-
-## :v: Code of conduct
-
-The Nextcloud community has core values that are shared between all members during conferences, hackweeks and on all interactions in online platforms including [Github](https://github.com/nextcloud) and [Forums](https://help.nextcloud.com). If you contribute, participate or interact with this community, please respect [our shared values](https://nextcloud.com/code-of-conduct/). :relieved:
-
-## :memo: Source code
-
-The Nextcloud Desktop Client is developed in Git. Since Git makes it easy to
+The ownCloud Desktop Client is developed in Git. Since Git makes it easy to
 fork and improve the source code and to adapt it to your need, many copies
 can be found on the Internet, in particular on GitHub. However, the
 authoritative repository maintained by the developers is located at
-https://github.com/nextcloud/desktop.
+https://github.com/owncloud/client.

-## :scroll: License
+## Building the source code
+
+[Building the Client](http://doc.owncloud.org/desktop/2.0/building.html)
+in the ownCloud Desktop Client manual.
+
+## Maintainers and Contributors
+
+The maintainers of this repository are:
+
+* Klaas Freitag <freitag@owncloud.com>
+* Daniel Molkentin <danimo@owncloud.com>
+* Markus Goetz <guruz@owncloud.com>
+* Olivier Goffart <ogoffart@owncloud.com>
+
+ownCloud Desktop Client is developed by the ownCloud community and receives
+patches from a variety of authors.
+
+## Reporting issues and contributing
+
+If you find any bugs or have any suggestion for improvement, please
+file an issue at https://github.com/owncloud/client/issues. Do not
+contact the authors directly by mail, as this increases the chance
+of your report being lost.
+
+If you created a patch, please submit a [Pull
+Request](https://github.com/owncloud/client/pulls). For non-trivial
+patches, we need you to sign the [Contributor
+Agreement](https://owncloud.org/contribute/agreement) before
+we can accept your patch.
+
+If you want to contact us, e.g. before starting a more complex feature,
+you can join us at
+[#owncloud-client-dev](irc://irc.freenode.net/#owncloud-client-dev).
+
+## License

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 5 )
-set( MIRALL_VERSION_PATCH 0 )
-set( MIRALL_VERSION_YEAR  2018 )
+set( MIRALL_VERSION_MINOR 2 )
+set( MIRALL_VERSION_PATCH 4 )
+set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/linux/Dockerfile
+++ b/admin/linux/Dockerfile
@@ -1,22 +0,0 @@
-# This DockerFile is used to create the image used for Jenkins, the CI system (see Jenkinsfile)
-# It is not meant to be used to create the production packages.
-
-# Distro with Qt 5.6
-FROM ubuntu:yakkety
-
-RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends \
-        locales \
-        build-essential \
-        clang \
-        ninja-build \
-        cmake \
-        extra-cmake-modules \
-        libsqlite3-dev \
-        libssl-dev \
-        libcmocka-dev \
-        qt5-default \
-        qttools5-dev-tools \
-        libqt5webkit5-dev \
-        qt5keychain-dev \
-        kio-dev \
-    && apt-get clean
--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -1,103 +0,0 @@
-#! /bin/bash
-
-set -xe
-
-mkdir /app
-mkdir /build
-
-#Set Qt-5.11
-export QT_BASE_DIR=/opt/qt511
-export QTDIR=$QT_BASE_DIR
-export PATH=$QT_BASE_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-
-#set defaults
-export SUFFIX=${DRONE_PULL_REQUEST:=master}
-if [ $SUFFIX != "master" ]; then
-    SUFFIX="PR-$SUFFIX"
-fi
-
-#QtKeyChain 0.8.0
-cd /build
-git clone https://github.com/frankosterfeld/qtkeychain.git
-cd qtkeychain
-git checkout v0.8.0
-mkdir build
-cd build
-cmake -D CMAKE_INSTALL_PREFIX=/usr ../
-make -j4
-make DESTDIR=/app install 
-
-#Build client
-cd /build
-mkdir build-client
-cd build-client
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-    -D NO_SHIBBOLETH=1 \
-    -D QTKEYCHAIN_LIBRARY=/app/usr/lib/x86_64-linux-gnu/libqt5keychain.so \
-    -D QTKEYCHAIN_INCLUDE_DIR=/app/usr/include/qt5keychain/ \
-    -DMIRALL_VERSION_SUFFIX=PR-$DRONE_PULL_REQUEST \
-    -DMIRALL_VERSION_BUILD=$DRONE_BUILD_NUMBER \
-    $DRONE_WORKSPACE
-make -j4
-make DESTDIR=/app install
-
-# Move stuff around
-cd /app
-
-mv ./usr/lib/x86_64-linux-gnu/nextcloud/* ./usr/lib/x86_64-linux-gnu/
-mv ./usr/lib/x86_64-linux-gnu/* ./usr/lib/
-rm -rf ./usr/lib/nextcloud
-rm -rf ./usr/lib/cmake
-rm -rf ./usr/include
-rm -rf ./usr/mkspecs
-rm -rf ./usr/lib/x86_64-linux-gnu/
-
-# Don't bundle nextcloudcmd as we don't run it anyway
-rm -rf ./usr/bin/nextcloudcmd
-
-# Don't bundle the explorer extentions as we can't do anything with them in the AppImage
-rm -rf ./usr/share/caja-python/
-rm -rf ./usr/share/nautilus-python/
-rm -rf ./usr/share/nemo-python/
-
-# Move sync exlucde to right location
-mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
-rm -rf ./etc
-
-sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop # Bug in desktop file?
-cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linuxeployqt bug, FIXME
-
-
-# Because distros need to get their shit together
-cp -R /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
-cp -R /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
-cp -P /usr/local/lib/libssl.so* ./usr/lib/
-cp -P /usr/local/lib/libcrypto.so* ./usr/lib/
-
-# NSS fun
-cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/
-
-# Use linuxdeployqt to deploy
-cd /build
-wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod a+x linuxdeployqt*.AppImage
-./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
-rm ./linuxdeployqt-continuous-x86_64.AppImage
-unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/app/usr/lib/
-./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
-
-# Set origin
-./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0
-
-# Build AppImage
-./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -appimage
-
-mv Nextcloud*.AppImage Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
-
-curl --upload-file $(readlink -f ./Nextcloud*.AppImage) https://transfer.sh/Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
-
-echo
-echo "Get the AppImage at the link above!"
--- a/admin/linux/clean_tarball.sh
+++ b/admin/linux/clean_tarball.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-rm -vrf admin/
-rm -vrf src/3rdparty/sqlite3   # FIXME: For CentOS6 we have to use our bundled sqlite
-rm -vrf binary/
-rm -vrf src/3rdparty/libcrashreporter-qt
-rm -vrf shell_integration/windows
-rm -vrf shell_integration/MacOSX
--- a/admin/linux/debian/README
+++ b/admin/linux/debian/README
@@ -1,31 +0,0 @@
- .pbuilderrc:
-
-  COMPONENTS="main restricted universe multiverse"
-
-  OTHERMIRROR="deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
-  HOOKDIR="${HOME}/pbuilder/hook.d"
-  BINDMOUNTS="${HOME}/pbuilder/deps"
-
-  EXTRAPACKAGES="apt-utils"
-
- pbuilder/hook.d/D70setupdeps: hook to create a Packages file for the
-  packages in pbuilder/deps
-
- pbuilder-dist trusty create --override-config --othermirror "deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
-
-  The OTHERMIRROR setting in .pbuilderrc is overridden by pbuilder-dist!
-
- scripts:
-
-  config.sh: basic configuration variables
-
-  create_debdir.sh <tag> <version> <distribution>:
-     create the Debian-conformant source directory and .orig.tar.bz2
-     in the build area
-  build.sh <tag> <version> <distribution> <debuild options...>:
-     call create_debdir.sh and then debuild
-  pbuilder.sh <distribution>:
-     build the existing source package with pbuilder-dist.
-  pbuild.sh <distribution>:
-     build the source packages with build.sh and then call
-     pbuilder.sh
--- a/admin/linux/debian/debian.bionic/changelog
+++ b/admin/linux/debian/debian.bionic/changelog
@@ -1,23 +0,0 @@
-nextcloud-client (2.3.3-1.0~bionic1) bionic; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0~bionic1) bionic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0~bionic1) bionic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4~bionic1) bionic; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
--- a/admin/linux/debian/debian.bionic/control
+++ b/admin/linux/debian/debian.bionic/control
@@ -1,88 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.cosmic/changelog
+++ b/admin/linux/debian/debian.cosmic/changelog
@@ -1,23 +0,0 @@
-nextcloud-client (2.3.3-1.0~cosmic1) cosmic; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0~cosmic1) cosmic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0~cosmic1) cosmic; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4~cosmic1) cosmic; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
--- a/admin/linux/debian/debian.cosmic/control
+++ b/admin/linux/debian/debian.cosmic/control
@@ -1,88 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.stable/changelog
+++ b/admin/linux/debian/debian.stable/changelog
@@ -1,48 +0,0 @@
-nextcloud-client (2.3.3-1.0~stable1) stable; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0) stable; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0) stable; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4) stable; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
-
-nextcloud-client (2.2.4-1.3) stable; urgency=medium
-
-  * Caja syncstate plugin is built.
-  * The syncstate plugin has application-specific name
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
-
-nextcloud-client (2.2.4-1.2) stable; urgency=medium
-
-  * Fixed appname in the Nemo syncstate extension.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
-
-nextcloud-client (2.2.4-1.1) stable; urgency=medium
-
-  * Added Nautilus and Nemo syncstate extensions.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
-
-nextcloud-client (2.2.4-1.0) stable; urgency=medium
-
-  * Initial release.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian.stable/control
+++ b/admin/linux/debian/debian.stable/control
@@ -1,82 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
+++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
@@ -1,24 +0,0 @@
-Binary files nextcloud-client-2.4.0.orig/.git/index and nextcloud-client-2.4.0/.git/index differ
-diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/src/CMakeLists.txt
--- nextcloud-client-2.4.0.orig/src/CMakeLists.txt	2018-02-01 19:16:38.461162563 +0100
-+++ nextcloud-client-2.4.0/src/CMakeLists.txt	2018-02-01 19:20:20.253824030 +0100
-@@ -4,7 +4,7 @@
- 
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
- 
-find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.5 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
- if (Qt5Core_VERSION VERSION_LESS 5.9.0)
- message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
- endif()
--- nextcloud-client-2.4.0.orig/admin/osx/CMakeLists.txt	2018-05-22 07:01:48.248646951 +0200
-+++ nextcloud-client-2.4.0/admin/osx/CMakeLists.txt	2018-05-22 07:01:51.012689711 +0200
-@@ -11,7 +11,7 @@
-   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
- endif()
- 
-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
-+find_package(Qt5 5.5 COMPONENTS Core REQUIRED)
- configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
- configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
- configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
--- a/admin/linux/debian/debian/101-sync-inotify.conf
+++ b/admin/linux/debian/debian/101-sync-inotify.conf
@@ -1 +0,0 @@
-fs.inotify.max_user_watches = 524288
--- a/admin/linux/debian/debian/changelog
+++ b/admin/linux/debian/debian/changelog
@@ -1,48 +0,0 @@
-nextcloud-client (2.3.3-1.0~xenial1) xenial; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0~xenial1) xenial; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0~xenial1) xenial; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4~xenial1) xenial; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
-
-nextcloud-client (2.2.4-1.3~xenial1) xenial; urgency=medium
-
-  * Caja syncstate plugin is built.
-  * The syncstate plugin has application-specific name
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
-
-nextcloud-client (2.2.4-1.2~xenial1) xenial; urgency=medium
-
-  * Fixed appname in the Nemo syncstate extension.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
-
-nextcloud-client (2.2.4-1.1~xenial1) xenial; urgency=medium
-
-  * Added Nautilus and Nemo syncstate extensions.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
-
-nextcloud-client (2.2.4-1.0~xenial1) xenial; urgency=medium
-
-  * Initial release.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian/compat
+++ b/admin/linux/debian/debian/compat
@@ -1 +0,0 @@
-9
--- a/admin/linux/debian/debian/control
+++ b/admin/linux/debian/debian/control
@@ -1,89 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian/copyright
+++ b/admin/linux/debian/debian/copyright
@@ -1,3 +0,0 @@
-Files: *
-Copyright: 2012-2015 ownCloud, inc.; Nuernberg, Germany., 2016 Nextcloud GmbH
-License: GPL-2+
--- a/admin/linux/debian/debian/libnextcloudsync-dev.install
+++ b/admin/linux/debian/debian/libnextcloudsync-dev.install
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*/libnextcloudsync.so
-usr/lib/*/nextcloud/libocsync.so
--- a/admin/linux/debian/debian/libnextcloudsync0.install
+++ b/admin/linux/debian/debian/libnextcloudsync0.install
@@ -1,3 +0,0 @@
-etc
-usr/lib/*/libnextcloudsync.so.?*
-usr/lib/*/nextcloud/libocsync.so.?*
--- a/admin/linux/debian/debian/nextcloud-client-caja.install
+++ b/admin/linux/debian/debian/nextcloud-client-caja.install
@@ -1 +0,0 @@
-usr/share/caja-python
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.install
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.install
@@ -1,4 +0,0 @@
-usr/lib/*/libnextclouddolphinpluginhelper.so
-usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
-usr/share/kservices5/nextclouddolphinactionplugin.desktop
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides
@@ -1,2 +0,0 @@
-nextcloud-client-dolphin: package-name-doesnt-match-sonames
-nextcloud-client-dolphin: shlib-without-versioned-soname
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.triggers
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.triggers
@@ -1 +0,0 @@
-activate-noawait ldconfig
--- a/admin/linux/debian/debian/nextcloud-client-l10n.install
+++ b/admin/linux/debian/debian/nextcloud-client-l10n.install
@@ -1 +0,0 @@
-usr/share/nextcloud/i18n
--- a/admin/linux/debian/debian/nextcloud-client-nautilus.install
+++ b/admin/linux/debian/debian/nextcloud-client-nautilus.install
@@ -1 +0,0 @@
-usr/share/nautilus-python
--- a/admin/linux/debian/debian/nextcloud-client-nemo.install
+++ b/admin/linux/debian/debian/nextcloud-client-nemo.install
@@ -1 +0,0 @@
-usr/share/nemo-python
--- a/admin/linux/debian/debian/nextcloud-client.install
+++ b/admin/linux/debian/debian/nextcloud-client.install
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/icons
-debian/101-sync-inotify.conf etc/sysctl.d
--- a/admin/linux/debian/debian/nextcloud-client.lintian-overrides
+++ b/admin/linux/debian/debian/nextcloud-client.lintian-overrides
@@ -1,3 +0,0 @@
-nextcloud-client: binary-or-shlib-defines-rpath
-nextcloud-client: binary-without-manpage
-nextcloud-client: license-problem-convert-utf-code
--- a/admin/linux/debian/debian/rules
+++ b/admin/linux/debian/debian/rules
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-
-DEB_SHLIBDEPS_INCLUDE=$(CURDIR)/$(DEB_BUILDDIR)/csync/src
-
-DEB_SRCDIR=.
-DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_SKIP_RPATH=OFF -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
--- a/admin/linux/debian/debian/source/format
+++ b/admin/linux/debian/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/admin/linux/debian/debian/source/lintian-overrides
+++ b/admin/linux/debian/debian/source/lintian-overrides
@@ -1,9 +0,0 @@
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/bootstrap.js line length is 22206 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js line length is 32412 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/bootstrap.js line length is 22206 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/jquery.js line length is 32412 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/bootstrap.js line length is 22206 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/jquery.js line length is 32412 characters (>512)
-nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_org/static/js/jquery-1.11.0.min.js
-nextcloud-client source: license-problem-convert-utf-code
--- a/admin/linux/debian/drone-build.sh
+++ b/admin/linux/debian/drone-build.sh
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-set -xe
-shopt -s extglob
-
-PPA=ppa:nextcloud-devs/client-beta
-PPA_BETA=ppa:nextcloud-devs/client-alpha
-
-OBS_PROJECT=home:ivaradi:beta
-OBS_PROJECT_BETA=home:ivaradi:alpha
-OBS_PACKAGE=nextcloud-client
-
-pull_request=${DRONE_PULL_REQUEST:=master}
-
-if test -z "${DRONE_WORKSPACE}"; then
-    DRONE_WORKSPACE=`pwd`
-fi
-
-if test -z "${DRONE_DIR}"; then
-    DRONE_DIR=`dirname ${DRONE_WORKSPACE}`
-fi
-
-set +x
-if test "$DEBIAN_SECRET_KEY" -a "$DEBIAN_SECRET_IV"; then
-    openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/signing-key.txt.enc -d | gpg --import
-
-    openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
-
-    touch ~/.has_ppa_keys
-fi
-set -x
-
-cd "${DRONE_WORKSPACE}"
-read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
-
-cd "${DRONE_DIR}"
-
-echo "$kind" > kind
-kind="release"
-
-if test "$kind" = "beta"; then
-    repo=nextcloud-devs/client-alpha
-else
-    repo=nextcloud-devs/client-beta
-fi
-
-origsourceopt=""
-
-if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/nextcloud-client_${basever}.orig.tar.bz2; then
-    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
-    tar cjf nextcloud-client_${basever}.orig.tar.bz2 --exclude .git nextcloud-client_${basever}
-    origsourceopt="-sa"
-fi
-
-for distribution in xenial bionic cosmic stable; do
-    rm -rf nextcloud-client_${basever}
-    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
-
-    cd nextcloud-client_${basever}
-
-    cp -a admin/linux/debian/debian .
-    if test -d admin/linux/debian/debian.${distribution}; then
-        tar cf - -C admin/linux/debian/debian.${distribution} . | tar xf - -C debian
-    fi
-
-    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution}
-    cp /tmp/tmpchangelog debian/changelog
-    if test -f admin/linux/debian/debian.${distribution}/changelog; then
-        cat admin/linux/debian/debian.${distribution}/changelog >> debian/changelog
-    else
-        cat admin/linux/debian/debian/changelog >> debian/changelog
-    fi
-
-    for p in debian/post-patches/*.patch; do
-        if test -f "${p}"; then
-            echo "Applying ${p}"
-            patch -p1 < "${p}"
-        fi
-    done
-
-    fullver=`head -1 debian/changelog | sed "s:nextcloud-client (\([^)]*\)).*:\1:"`
-
-    EDITOR=true dpkg-source --commit . local-changes
-
-    dpkg-source --build .
-    dpkg-genchanges -S ${origsourceopt} > "../nextcloud-client_${fullver}_source.changes"
-
-    if test -f ~/.has_ppa_keys; then
-        debsign -k7D14AA7B -S
-    fi
-
-    cd ..
-done
-
-if test "${pull_request}" = "master"; then
-    kind=`cat kind`
-
-    if test "$kind" = "beta"; then
-        PPA=$PPA_BETA
-        OBS_PROJECT=$OBS_PROJECT_BETA
-    fi
-    OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"
-
-    if test -f ~/.has_ppa_keys; then
-        for changes in nextcloud-client_*~+([a-z])1_source.changes; do
-            dput $PPA $changes > /dev/null
-        done
-
-        mkdir osc
-        cd osc
-        osc co ${OBS_PROJECT} ${OBS_PACKAGE}
-        if test "$(ls ${OBS_SUBDIR})"; then
-            osc delete ${OBS_SUBDIR}/*
-        fi
-        cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
-        cp ../nextcloud-client_*[0-9.][0-9].dsc ${OBS_SUBDIR}/
-        cp ../nextcloud-client_*[0-9.][0-9].debian.tar* ${OBS_SUBDIR}/
-        cp ../nextcloud-client_*[0-9.][0-9]_source.changes ${OBS_SUBDIR}/
-        osc add ${OBS_SUBDIR}/*
-
-        cd ${OBS_SUBDIR}
-        osc commit -m "Travis update"
-    fi
-fi
--- a/admin/linux/debian/oscrc.enc
+++ b/admin/linux/debian/oscrc.enc
--- a/admin/linux/debian/scripts/addchange.sh
+++ b/admin/linux/debian/scripts/addchange.sh
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-
-DEFAULT_DIST=yakkety
-
-package="nextcloud-client"
-version="$1"
-comment="$2"
-distver="${3:-}"
-
-if test -z "${distver}"; then
-    distver="1"
-fi
-
-packagedir="${scriptdir}/../${package}"
-
-now=`date -R`
-
-tmpfile="/tmp/addchange.$$"
-
-for subdir in "${packagedir}/debian"*; do
-    if test -f "${subdir}/changelog"; then
-        echo "${subdir}"
-        bname=`basename "${subdir}"`
-        dist=`echo "${bname}" | sed 's:debian\.\?::'`
-        if test -z "${dist}"; then
-            dist="${DEFAULT_DIST}"
-        fi
-        if test "${dist}" = "stable"; then
-            versuffix=""
-        else
-            versuffix="~${dist}${distver}"
-        fi
-        cat > "${tmpfile}" <<EOF
-${package} (${version}${versuffix}) ${dist}; urgency=medium
-
-  * ${comment}
-
- -- István Váradi <ivaradi@varadiistvan.hu>  ${now}
-
-EOF
-        cat "${subdir}/changelog" >> "${tmpfile}"
-        mv "${tmpfile}" "${subdir}/changelog"
-    fi
-done
-
-rm -f "${tmpfile}"
--- a/admin/linux/debian/scripts/config.sh
+++ b/admin/linux/debian/scripts/config.sh
@@ -1,26 +0,0 @@
-# The directory where the sources are found
-SOURCES="${HOME}/sources/nextcloud/client"
-
-# The directory into which the packages should be genereated
-BUILDAREA="${SOURCES}/build-area"
-
-# The directory containing the Git repositories
-GITROOTS="${SOURCES}/git"
-
-# The pbuilder root directory
-PBUILDER_ROOT="${HOME}/pbuilder"
-
-# The dependencies directory for pbuilder
-PBUILDER_DEPS="${PBUILDER_ROOT}/deps"
-
-# The version of the nextcloud-client package
-NEXTCLOUD_CLIENT_VERSION=2.4.0
-
-# The FULL version of the nextcloud-client package
-NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.0~@DISTRIBUTION@1"
-
-# The tag of the nextcloud-client package
-NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
-
-# The number of CPUs that can be used for paralel builds
-NUMCPUS=4
--- a/admin/linux/debian/scripts/create_debdir.sh
+++ b/admin/linux/debian/scripts/create_debdir.sh
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-scriptdir=`cd "${scriptdir}" && pwd`
-
-. "${scriptdir}/config.sh"
-
-package="nextcloud-client"
-tag="${1}"
-version="${2}"
-distribution="${3}"
-
-gitdir="${GITROOTS}/client"
-packagedir="${BUILDAREA}/${package}_${version}"
-origtarname="${package}_${version}.orig.tar.bz2"
-origtar="${BUILDAREA}/${origtarname}"
-
-archive_submodules()
-{
-    local subdir="${1}"
-    local treeish="${2}"
-
-    local dir="${gitdir}"
-    local destdir="${packagedir}"
-    if test "${subdir}"; then
-        echo "  copying submodule ${subdir}"
-        dir="${dir}/${subdir}"
-        destdir="${destdir}/${subdir}"
-    fi
-
-    mkdir -p "${destdir}"
-
-    (cd "${dir}"; git archive "${treeish}" | tar xf - -C "${destdir}")
-
-    (cd "${dir}"; git ls-tree "${treeish}" -r) | while read mode type object file; do
-        if test "${type}" = "commit"; then
-            sdir="${file}"
-            if test "${subdir}"; then
-                sdir="${subdir}/${sdir}"
-            fi
-            archive_submodules "${sdir}" "${object}"
-        fi
-    done
-}
-
-rm -rf "${packagedir}"
-mkdir -p "${packagedir}"
-
-echo "Updating submodules"
-commit=`cd "${gitdir}"; git rev-parse HEAD`
-(cd "${gitdir}"; git checkout "${tag}"; git submodule update --recursive --init)
-
-echo "Copying sources"
-archive_submodules "" "${tag}"
-
-if test -f "${GITROOTS}/${origtarname}"; then
-    echo "Copying orig archive from ${GITROOTS}"
-    cp -a "${GITROOTS}/${origtarname}" "${BUILDAREA}"
-else
-    echo "Creating orig archive"
-    tar cjf "${origtar}" -C "${BUILDAREA}" "${package}_${version}"
-fi
-
-echo "Restoring Git state"
-(cd "${gitdir}"; git checkout "${commit}")
-cd "${scriptdir}"
-
-echo "Copying Debian files"
-mkdir -p "${packagedir}/debian"
-tar cf - -C "${scriptdir}/../debian" . | tar xf - -C "${packagedir}/debian"
-
-if test -d "${scriptdir}/../debian.${distribution}"; then
-    tar cf - -C "${scriptdir}/../debian.${distribution}" . | tar xf - -C "${packagedir}/debian"
-fi
-
-pushd "${packagedir}"
-for p in debian/post-patches/*.patch; do
-    if test -f "${p}"; then
-        echo "Applying ${p}"
-        patch -p1 < "${p}"
-    fi
-done
-popd
-
-"${scriptdir}/git2changelog.py"  /tmp/git2changelog "${distribution}"
-mv "${packagedir}/debian/changelog" "${packagedir}/debian/changelog.old"
-cat /tmp/git2changelog "${packagedir}/debian/changelog.old" > "${packagedir}/debian/changelog"
--- a/admin/linux/debian/scripts/git2changelog.cfg
+++ b/admin/linux/debian/scripts/git2changelog.cfg
@@ -1,8 +0,0 @@
-# Use the configuration below with appropriate changes,
-# if you want to support a new client version using
-# your own fork. In such a case the tags do not come
-# accross to the main repo for a pull request, so
-# some hacking is needed
-[versionhack]
-commit = bc7e65b39552ac458b2adacf76cbf98735ec29a0
-tag = v2.4.0-beta
--- a/admin/linux/debian/scripts/git2changelog.py
+++ b/admin/linux/debian/scripts/git2changelog.py
@@ -1,140 +0,0 @@
-#!//usr/bin/env python2.7
-
-import subprocess
-import re
-import sys
-import datetime
-import os
-import ConfigParser
-
-distribution="yakkety"
-
-versionTagRE = re.compile("^v([0-9]+((\.[0-9]+)+))(-(.+))?$")
-
-def processVersionTag(tag):
-    m = versionTagRE.match(tag)
-    if m:
-        return (m.group(1), "release" if m.group(4) is None else "beta")
-    else:
-        return None
-
-def getCommitVersion(commit):
-    major=None
-    minor=None
-    patch=None
-    for line in subprocess.check_output(["git", "show",
-                                         commit + ":VERSION.cmake"]).splitlines():
-        m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line)
-        if m is not None:
-            kind=m.group(1)
-            version=m.group(2)
-            if kind=="MAJOR":
-                major=version
-            elif kind=="MINOR":
-                minor=version
-            elif kind=="PATCH":
-                patch=version
-    if major and minor and patch:
-        return major + "." + minor + "." + patch
-    else:
-        return None
-
-def collectEntries(baseCommit, baseVersion, kind):
-    scriptdir = os.path.dirname(__file__)
-    configPath = os.path.join(scriptdir, "git2changelog.cfg")
-
-    newVersionCommit = None
-    newVersionTag = None
-    newVersionOrigTag = None
-
-    if os.path.exists(configPath):
-        config = ConfigParser.SafeConfigParser()
-        config.read(configPath)
-        if config.has_section("versionhack"):
-            if config.has_option("versionhack", "commit") and \
-               config.has_option("versionhack", "tag"):
-                newVersionCommit = config.get("versionhack", "commit")
-                newVersionTag = config.get("versionhack", "tag")
-
-    entries = []
-
-    args = ["git", "log",
-            "--format=%h%x09%an%x09%ae%x09%aD%x09%ad%x09%s",
-            "--date=unix", "--author-date-order", "--reverse"]
-    try:
-        output = subprocess.check_output(args + [baseCommit + ".."])
-    except:
-        output = subprocess.check_output(args)
-
-
-    lastVersionTag = None
-    lastCMAKEVersion = None
-    for line in output.splitlines():
-        (commit, name, email, date, revdate, subject) = line.split("\t")
-        revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
-
-        if commit==newVersionCommit:
-            result = processVersionTag(newVersionTag)
-            if result:
-                newVersionOrigTag = lastVersionTag
-                (baseVersion, kind) = result
-
-
-        version=getCommitVersion(commit)
-        if version and version!=lastCMAKEVersion:
-            tag = "v" + version
-            if tag!=newVersionOrigTag:
-                result = processVersionTag(tag)
-                if result:
-                    lastVersionTag = tag
-                    lastCMAKEVersion = version
-                    (baseVersion, kind) = result
-
-        for tag in subprocess.check_output(["git", "tag",
-                                            "--points-at",
-                                            commit]).splitlines():
-            if tag!=newVersionOrigTag:
-                result = processVersionTag(tag)
-                if result:
-                    lastVersionTag = tag
-                    (baseVersion, kind) = result
-
-
-        entries.append((commit, name, email, date, revdate, subject,
-                        baseVersion, kind))
-
-    entries.reverse()
-
-    return entries
-
-def genChangeLogEntries(f, entries, distribution):
-    latestBaseVersion = None
-    latestKind = None
-    for (commit, name, email, date, revdate, subject, baseVersion, kind) in entries:
-        if latestBaseVersion is None:
-            latestBaseVersion = baseVersion
-            latestKind = kind
-        upstreamVersion = baseVersion + "-" + revdate
-        if distribution=="stable":
-            version = upstreamVersion
-        else:
-            version = upstreamVersion + "~" + distribution + "1"
-        print >> f, "nextcloud-client (%s) %s; urgency=medium" % (version, distribution)
-        print >> f
-        print >> f, "  * " + subject
-        print >> f
-        print >> f, " -- %s <%s>  %s" % (name, email, date)
-        print >> f
-    return (latestBaseVersion, latestKind)
-
-if __name__ == "__main__":
-
-    distribution = sys.argv[2]
-
-    #entries = collectEntries("8aade24147b5313f8241a8b42331442b7f40eef9", "2.2.4", "release")
-    entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "release")
-
-
-    with open(sys.argv[1], "wt") as f:
-        (baseVersion, kind) = genChangeLogEntries(f, entries, distribution)
-        print baseVersion, kind
--- a/admin/linux/debian/scripts/pbuild.sh
+++ b/admin/linux/debian/scripts/pbuild.sh
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-scriptdir=`cd "${scriptdir}" && pwd`
-
-. "${scriptdir}/config.sh"
-
-distribution="${1}"
-shift
-
-pushd /
-"${scriptdir}/build.sh" "${distribution}" -S "$@"
-
-"${scriptdir}/pbuilder.sh" "${distribution}" "$@"
-popd
--- a/admin/linux/debian/scripts/pbuilder.sh
+++ b/admin/linux/debian/scripts/pbuilder.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e -u
-
-scriptdir=`dirname $0`
-
-. "${scriptdir}/config.sh"
-
-distribution="${1}"
-shift
-
-resultdir="${PBUILDER_ROOT}/${distribution}_result"
-
-rm -f "${PBUILDER_DEPS}/"*.deb
-echo -n > "${PBUILDER_DEPS}/Packages"
-rm -f "${resultdir}/"*
-
-source "${HOME}/.pbuilderrc"
-
-dscversion=`echo ${NEXTCLOUD_CLIENT_FULL_VERSION} | sed "s:@DISTRIBUTION@:${distribution}:g"`
-pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" --debbuildopts "-j${NUMCPUS}" "$@" "${BUILDAREA}/nextcloud-client_${dscversion}.dsc"
--- a/admin/linux/debian/signing-key.txt.enc
+++ b/admin/linux/debian/signing-key.txt.enc
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,6 +1,6 @@

 # Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from NEXTCLOUD.cmake for the non
+# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
@@ -11,8 +11,7 @@ else()
  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()

-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
-configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
-configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
+configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -23,7 +23,7 @@ identity="$3"
 prjfile=$build_path/admin/osx/macosx.pkgproj

 # The name of the installer package
-installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -5,8 +5,7 @@
 #
 #  ownCloud 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 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  ownCLoud is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +21,6 @@ import subprocess
 import commands
 import sys
 from glob import glob
-from distutils.version import LooseVersion

 def QueryQMake(attrib):
    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
@@ -32,7 +30,7 @@ FRAMEWORK_SEARCH_PATH=[
    os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]

-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Qt-5.6.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']

 QT_PLUGINS = [
    'sqldrivers/libqsqlite.dylib',
@@ -41,12 +39,12 @@ QT_PLUGINS = [
    'imageformats/libqico.dylib',
    'imageformats/libqjpeg.dylib',
    'imageformats/libqsvg.dylib',
+    'imageformats/libqmng.dylib',
 ]

 QT_PLUGINS_SEARCH_PATH=[
 #    os.path.join(os.environ['QTDIR'], 'plugins'),
-#    '/usr/local/Cellar/qt/5.2.1/plugins',
-    '/usr/local/Qt-5.6.2/plugins',
+    '/usr/local/Cellar/qt/5.2.1/plugins',
 ]


@@ -94,8 +92,6 @@ commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];

-qt_version = QueryQMake('QT_VERSION')
-print "Using Qt", qt_version

 fixed_libraries = []
 fixed_frameworks = []
@@ -265,9 +261,9 @@ def CopyFramework(source_dylib):
      dest_path = os.path.join(frameworks_dir, framework)
      dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
      break
-#  if os.path.exists(dest_path):
-#    print dest_path, "already exists, skipping copy..."
-#    return os.path.join(dest_dylib_path, dylib_name)
+  if os.path.exists(dest_path):
+    print dest_path, "already exists, skipping copy..."
+    return os.path.join(dest_dylib_path, dylib_name)

  args = ['mkdir', '-p', dest_dylib_path]
  commands.append(args)
@@ -283,10 +279,6 @@ def CopyFramework(source_dylib):
  commands.append(args)
  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Resources'), os.path.join(dest_path, 'Versions', '5')]
  commands.append(args)
-  args = ['ln', '-s', os.path.join('Versions', 'Current', 'Helpers'), os.path.join(dest_path, 'Helpers')]
-  commands.append(args)
-  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Helpers'), os.path.join(dest_path, 'Versions', '5')]
-  commands.append(args)

  return os.path.join(dest_dylib_path, dylib_name)

@@ -345,13 +337,6 @@ for binary in binaries:
 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

-if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
-  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
-  commands.append(args)
-else:
-  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
-  commands.append(args)
-
 if len(sys.argv) <= 2:
  print 'Will run %d commands:' % len(commands)
  for command in commands:
--- a/admin/osx/macosx.pkgproj.cmake
+++ b/admin/osx/macosx.pkgproj.cmake
@@ -506,6 +506,536 @@
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
 		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Utilities</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>SyncStateFinder.osax</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>ScriptingAdditions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>Extensions</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>1</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Library</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>System</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>2</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>POSTINSTALL_PATH</key>
+				<dict/>
+				<key>PREINSTALL_PATH</key>
+				<dict/>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.ownCloud.finderPlugin</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Legacy Finder Plugin (OS X 10.9 or older)</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<false/>
+				<key>VERSION</key>
+				<string>@MIRALL_VERSION_FULL@</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+		</dict>
 	</array>
 	<key>PROJECT</key>
 	<dict>
@@ -573,15 +1103,56 @@
 								<key>UUID</key>
 								<string>9647ADC0-BD53-4D7D-A561-73D383AACDE1</string>
 							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+								                                                                <key>REQUIREMENTS</key>
+								                                                               <array>
+								                                                                       <dict>
+								                                                                               <key>BEHAVIOR</key>
+								                                                                               <integer>1</integer>
+								                                                                               <key>DICTIONARY</key>
+								                                                                               <dict>
+								                                                                                       <key>IC_REQUIREMENT_JAVASCRIPT_FUNCTION</key>
+								                                                                                       <string>olderOsx</string>
+								                                                                                       <key>IC_REQUIREMENT_JAVASCRIPT_PARAMETERS</key>
+								                                                                                       <array/>
+								                                                                               </dict>
+								                                                                               <key>IDENTIFIER</key>
+								                                                                               <string>fr.whitebox.Packages.requirement.javascript</string>
+								                                                                               <key>MESSAGE</key>
+								                                                                               <array/>
+								                                                                               <key>NAME</key>
+								                                                                               <string>JavaScript</string>
+								                                                                               <key>STATE</key>
+							                                                                                <true/>
+								                                                                       </dict>
+								                                                               </array>								
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>1D2C47E0-5FD3-4623-B934-1347C66782D0</string>
+							</dict>
 						</array>
 						<key>REMOVED</key>
 						<dict/>
 					</dict>
 				</dict>
 				<key>INSTALLATION TYPE</key>
-                                <integer>1</integer>
-                                <key>MODE</key>
-                                <integer>1</integer>
+				<integer>0</integer>
 			</dict>
 			<key>INSTALLATION_STEPS</key>
 			<array>
@@ -701,7 +1272,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-                                <string>@CMAKE_INSTALL_PREFIX@/.</string>
+				<string>../install/.</string>
 				<key>PATH_TYPE</key>
 				<integer>3</integer>
 			</dict>
@@ -879,6 +1450,18 @@
 			<string>@CMAKE_INSTALL_DIR@</string>
 		</dict>
 	</dict>
+	        <key>SHARED_GLOBAL_DATA</key>
+	        <dict>
+	                <key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
+	                <string>
+	function olderOsx() {
+   if(system.compareVersions(system.version.ProductVersion, '10.10') == -1) {
+	    return true;
+	}
+	return false;
+	}
+	</string>
+	        </dict>	
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>
--- a/admin/osx/post_install.sh.cmake
+++ b/admin/osx/post_install.sh.cmake
@@ -1,16 +1,12 @@
 #!/bin/sh

-# Check if Finder is running (for systems with Finder disabled)
-finder_status=`ps aux | grep "/System/Library/CoreServices/Finder.app/Contents/MacOS/Finder" | grep -v "grep"`
-if ! [ "$finder_status" == "" ] ; then # Finder is running
-   osascript << EOF
+osascript << EOF
 tell application "Finder"
   activate
   select the last Finder window
 	reveal POSIX file "/Applications/@APPLICATION_EXECUTABLE@.app"
 end tell
 EOF
-fi

 # Always enable the new 10.10 finder plugin if available
 if [ -x "$(command -v pluginkit)" ]; then
--- a/admin/osx/pre_install.sh.cmake
+++ b/admin/osx/pre_install.sh.cmake
@@ -3,4 +3,7 @@
 # kill the old version. see issue #2044
 killall @APPLICATION_EXECUTABLE@

+# Unload the Finder plugin. see issue #2105
+killall Finder
+
 exit 0
--- a/admin/osx/sparkle/dsa_pub.pem
+++ b/admin/osx/sparkle/dsa_pub.pem
@@ -1,36 +1,12 @@
 -----BEGIN PUBLIC KEY-----
-MIIGOzCCBC0GByqGSM44BAEwggQgAoICAQCwGHwZVKUPwJafICkknBmoIS7TGjfw
-TnHpZdWJ/kVvMIhFiui3cJaB85e8R2yGRq7wr6ljYCR5EyjRXEJGEFW05PCUxLhh
-LnUg7yWIL1EnRM61zSlnWer4f7IBO7Qf8hd35jL5VuQtqE+Shq1vtC21SFO6GMog
-sfQdeyhTMIH67nw19fDxbyqPh+fPsBgitWmO07eF132Qxju0MwXvaju3YrXepuoR
-ClonI8pfPCJAAyJd5sEAfJPiqObgW/ehNgU5mVXv2D6VNtvvyu0flnvj05TOtkz+
-6392xh0u/xtz1F1clPe31JW3C2zxkvS14M7eSn96hMlojLev75/V84pQNZ7qXQ/X
-TxWaucnipJ94EqRLTg1hD3qwyC+5JKqOA6ELFmMARsP2MV4wmBIE+bz/bP2g7UCT
-UIJVTZrZAemozMFR6zsQQMrdz9fEPXQhibcg3LppMnnTkAJUdMkKlGIpehGe1tVC
-LaOgYh03zf/N7yFwH9eMIiAoXTlqR7iRO1HHsXn60OF8XYEt8Xga8cK7zMiPYOqm
-o4rheeXw33pckX63glOjJ+ADH1jhU7vOjRsAySXMFjanD8A31Mh8NbhuvPJowJAx
-ez8Hu4M6+fg644z7WHmsrbp0R3/Ow9FI/zmvYT6najOlEwnar8ix210ezjWmAOxN
-BTuHN6Bj7ckgdQIVAKwAcb77T0Fyjus9ZImfCqlKdihZAoICABiPO4bywe636AlU
-FRhMS/XFeGqRD7GbJSbGzIahooUPyVAeyRIU1HzmeVPx7jTqcoqcau0vXfv10EB+
-nJ3q6EzfCbitGIDJ1TjT2BhMtsnhzplhvVOAThuLnLpYwa3h8DIfgTqxh+DaCJHc
-ccdl/sAgj/6m54FCRc5ukyQZZeOFgSO2L+JfGDYJpn1CFuRVrXr4DbvtUDItRTbQ
-Gxlg5OEx2D1eO5DHtmuRPBZbumgACnFeD97tRQVjVKqQiMU3ZfNDp+mub0/MS/PY
-djDZIZM4E3/Nx+IuSuRELGKgifM/ED0tyiq6FYy9kx1nVVoRhWt29ipkQSskvRL3
-Ba593/u7dMt2Pa/RVNha+9J1VIadblNu0OkieI8OrPJ8PEdrr3Igit1GuURxz/oR
-c4T5nWCM+7e9yxs1resVDsU4D0aJVBMnE7IZwnN9/f4wduR0rxuBTLbMgtgBoIak
-JhgplAQu7SdSxKSpY6keGZUpt8ATkixkScZmVhFKmuVYc1c0tLfUqQnlC4Ty44Wk
-MEyub6749iRgNQp9vzvntS3EoLDho4CdEWlrp7YBtvTPiey46gcoLeLNZVyGuQ42
-CdFw09MIDPEhXBe6oWsOqW4OUla/UoVJyEjuPeiNIMruUJKIGkB1RL6OaiWxJkGM
-2HXSebMEweWuScaJmNR5VX87n6KTA4ICBgACggIBAKIAUUc/MJYZYkZectbSabZy
-TmlrPmi00q7wpsInTieeKVqOSypS+fuoiG2uuUX4+duqK8mLiA9WC0/y/cBJiWth
-Bp28s1ADdC98wamERYpZOxWuHDS9MEsovQzm5RIxgVtZbK7vKk/f0WbGE6xwgERH
-dt1zSZRh1ZWi/UWDVGHjlVMEhtNxoRD/Q5T4KUpLez0DNf2VpKk17KsqD2sS1zit
-IwIMR++PEY9Rfw1FWIkE5GzJnjxR8sUr6hg5A4z779W7qW/KK5DGlOVYrHhdxUDA
-b5q4wGBP3sDCPhhZ/g1V62tb1LAXnTMgAkdXGpRCxoe21TcB21PSQAbW1sOpFbSu
-07kMLAZIh+L1eR5sY6z7S/pqE4W4ukYUEFJPUSCVUCXkN2ZbSfbQLLi2mVNNIp7u
-/MJVxNQOtRqHM+2/nN+98Grivr1ct1G1NUHYgP/lr7Y2QNBiST0Lcnos8pjmI42v
-0NxCt+BOx+cc0SNXxRJD2j73IgzD8YW3gvWfzSwUcIqgC27JEEMhscEVNI4vD/CR
-mdDmYm0QJdBmEczPf5cA5gyAa1ATYS8ejrh6HpbC++FpSf4FN++5uu9cXtYJgI9B
-G0ZEvlGwqzStV35LeqwF2KBSZIspquILBDJDaKHG7wPE5/MdSsFky1awX7jgyGZV
-H5CvBpIDHOrQ0r1b40oB
+MIIBtzCCASsGByqGSM44BAEwggEeAoGBANC50nTWzroQwwawgaV4jd5TjjqbGKDH
+6CWbZzyfJ246mJcrwTfM2h5Z80GwLSNFBIjtLGpFd7Wd+CI1dY8oIOYxnYgWDSJC
+Al1RMoUSSwx0LRr8J3gojcvvsrhk/t57o9bjXynE2tiP1fwzPb+B3NH/02fMnzfH
+k+B8/8GOnX8dAhUA9PZ1QrH/mN+7ckiGjmoegZdv9tMCgYBPEj2850r8+9tXljU4
+X0s1NKBfiyhBGw/quJMZ3k0fQ/tpOyYwXYBg+9GBVc4pF1CKMVGoBS6XnLrZ1OkC
+OP9g+NNH5cLOKrBxjtd1GPG8UF/sZpak2sVfuNKzRtFT/6WFHc3f7C+LiDFZ2aPO
+A+Kr5MZJ8xxYDYj16WV2nKgoQgOBhQACgYEAuQzycfUZKm7MR9WZSFF9uQ3N3SQr
+PKYggCl6GTdWYmrsFyXLEBmb3m2qXxx9AcfR2LdkTp/CRCzm+HD6wyHVAAVG2kI2
+mWafcahlx/lVMd2yytdRE5pjpjLxw7rrt/fvSZsGwUswQJLl4iDWoE+mFfaaZnnM
+JKoiKLX7LUFOPaU=
 -----END PUBLIC KEY-----
--- a/admin/qt/patches/0001-Fix-crash-on-Mac-OS-if-PAC-URL-contains-non-URL-lega.patch
+++ b/admin/qt/patches/0001-Fix-crash-on-Mac-OS-if-PAC-URL-contains-non-URL-lega.patch
@@ -0,0 +1,42 @@
+From ea4dcc5931d455e4ee3e958ffa54a9f54ab022c8 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <daniel@molkentin.de>
+Date: Mon, 5 Jan 2015 10:45:25 +0100
+Subject: [PATCH 1/3] Fix crash on Mac OS if PAC URL contains non-URL legal
+ chars
+
+macQueryInternal() was retrieving the PAC URL string as-entered by
+the user in the 'Proxies' tab of the system network settings dialog
+and passing it to CFURLCreateWithString().
+
+CFURLCreateWithString() returns null if the input string contains
+non-URL legal chars or is empty.
+
+Change-Id: I9166d0433a62c7b2274b5435a7dea0a16997d10e
+Patch-By: Robert Knight
+Task-number: QTBUG-36787
+Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
+Reviewed-by: Markus Goetz <markus@woboq.com>
+---
+ src/network/kernel/qnetworkproxy_mac.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
+index 7d26246..81bce0c 100644
+--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
+@@ -221,7 +221,11 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
+         int enabled;
+         if (CFNumberGetValue(pacEnabled, kCFNumberIntType, &enabled) && enabled) {
+             // PAC is enabled
+-            CFStringRef cfPacLocation = (CFStringRef)CFDictionaryGetValue(dict, kSCPropNetProxiesProxyAutoConfigURLString);
+            // kSCPropNetProxiesProxyAutoConfigURLString returns the URL string
+            // as entered in the system proxy configuration dialog
+            CFStringRef pacLocationSetting = (CFStringRef)CFDictionaryGetValue(dict, kSCPropNetProxiesProxyAutoConfigURLString);
+            QCFType<CFStringRef> cfPacLocation = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, pacLocationSetting, NULL, NULL,
+                kCFStringEncodingUTF8);
+ 
+             if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) {
+                 QCFType<CFDataRef> pacData;
+-- 
+1.8.3.4 (Apple Git-47)
+
--- a/admin/qt/patches/0002-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
+++ b/admin/qt/patches/0002-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
@@ -0,0 +1,38 @@
+From a83e4d1d9dd90d4563ce60f27dfb7802a780e33e Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <daniel@molkentin.de>
+Date: Mon, 5 Jan 2015 11:42:52 +0100
+Subject: [PATCH 2/3] Fix possible crash when passing an invalid PAC URL
+
+This commit checks whether CFURLCreateWithString() succeeded.
+
+It does not appear to be possible to enter an empty URL directly in the
+PAC configuration dialog but I can't rule out the possibility
+that it could find its way into the settings via some other means.
+
+Change-Id: I6c2053d385503bf0330f5ae9fb1ec36a473d425d
+Patch-By: Robert Knight
+Task-number: QTBUG-36787
+Reviewed-by: Markus Goetz <markus@woboq.com>
+Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
+---
+ src/network/kernel/qnetworkproxy_mac.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
+index 81bce0c..6be032e 100644
+--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
+@@ -230,6 +230,10 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
+             if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) {
+                 QCFType<CFDataRef> pacData;
+                 QCFType<CFURLRef> pacUrl = CFURLCreateWithString(kCFAllocatorDefault, cfPacLocation, NULL);
+                if (!pacUrl) {
+                    qWarning("Invalid PAC URL \"%s\"", qPrintable(QCFString::toQString(cfPacLocation)));
+                    return result;
+                }
+                 SInt32 errorCode;
+                 if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, pacUrl, &pacData, NULL, NULL, &errorCode)) {
+                     QString pacLocation = QCFString::toQString(cfPacLocation);
+-- 
+1.8.3.4 (Apple Git-47)
+
--- a/admin/qt/patches/0003-Fix-crash-if-PAC-script-retrieval-returns-a-null-CFD.patch
+++ b/admin/qt/patches/0003-Fix-crash-if-PAC-script-retrieval-returns-a-null-CFD.patch
@@ -0,0 +1,39 @@
+From 83bd9393e5564ea9168fda90c0f44456633a483a Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <daniel@molkentin.de>
+Date: Mon, 5 Jan 2015 15:22:57 +0100
+Subject: [PATCH 3/3] Fix crash if PAC script retrieval returns a null CFData
+ instance
+
+The documentation for CFURLCreateDataAndPropertiesFromResource()
+does not make this clear but from looking at the CFNetwork implementation
+and a user stacktrace it appears that this function can return true
+but not set the data argument under certain circumstances.
+
+Change-Id: I48034a640d6f47a51cd5883bbafacad4bcbd0415
+Task-number: QTBUG-36787
+Patch-By: Robert Knight
+Reviewed-by: Markus Goetz <markus@woboq.com>
+Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
+---
+ src/network/kernel/qnetworkproxy_mac.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
+index 6be032e..a1ac349 100644
+--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
+@@ -240,7 +240,10 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
+                     qWarning("Unable to get the PAC script at \"%s\" (%s)", qPrintable(pacLocation), cfurlErrorDescription(errorCode));
+                     return result;
+                 }
+-
+                if (!pacData) {
+                    qWarning("\"%s\" returned an empty PAC script", qPrintable(QCFString::toQString(cfPacLocation)));
+                    return result;
+                }
+                 QCFType<CFStringRef> pacScript = CFStringCreateFromExternalRepresentation(kCFAllocatorDefault, pacData, kCFStringEncodingISOLatin1);
+                 if (!pacScript) {
+                     // This should never happen, but the documentation says it may return NULL if there was a problem creating the object.
+-- 
+1.8.3.4 (Apple Git-47)
+
--- a/admin/qt/patches/0004-Cocoa-Fix-systray-SVG-icons.patch
+++ b/admin/qt/patches/0004-Cocoa-Fix-systray-SVG-icons.patch
@@ -0,0 +1,32 @@
+From 22f3d359350fd65e4bbe2e9420fcc4460e8a590a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
+Date: Tue, 10 Mar 2015 22:37:39 +0100
+Subject: [PATCH] Cocoa: Fix systray SVG icons.
+
+Regression caused by f3699510.
+
+Task-number: QTBUG-44686
+Change-Id: I546422a67d4da29fac196025b09bddcb45c1b641
+Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
+---
+ src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+index e449fd3..8a35705 100755
+--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+@@ -234,6 +234,10 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+         }
+     }
+ 
+    // Handle SVG icons, which do not return anything for availableSizes().
+    if (!selectedSize.isValid())
+        selectedSize = icon.actualSize(QSize(maxPixmapHeight, maxPixmapHeight), mode);
+
+     QPixmap pixmap = icon.pixmap(selectedSize, mode);
+ 
+     // Draw a low-resolution icon if there is not enough pixels for a retina
+-- 
+1.9.1
+
--- a/admin/qt/patches/0005-OSX-Fix-disapearing-tray-icon.patch
+++ b/admin/qt/patches/0005-OSX-Fix-disapearing-tray-icon.patch
@@ -0,0 +1,115 @@
+From ee7fea33383726f0bb72e8082a357820e3ee3675 Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jturcotte@woboq.com>
+Date: Tue, 24 Feb 2015 17:02:02 +0100
+Subject: [PATCH] OSX Fix disapearing tray icon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It would happen together with an error:
+    QPainter::begin: Paint device returned engine == 0
+and would be caused by the size provided to QIcon::pixmap being empty,
+itself caused by the availableSizes list being empty for the Selected
+mode.
+
+This bug was most often hidden by the fact that the Selected icon mode
+was not triggered properly since we usually only set menuVisible after
+calling updateIcon, and most of the time when it did, we would overwrite
+it right after with a Normal mode icon.
+
+Fix the issue by disabling the broken feature completely since the
+default Selected icon is grayed out while tray icons are now usually
+black (or white when selected). To support the dark menu bar mode on
+10.10 we'll need to use NSImage's setTemplate anyway and that
+knowing in advance if we can invert the colors ourselves would also
+better solve the menuVisible usecase.
+
+Task-number: QTBUG-42910
+Change-Id: If9ec9659af28ecceb841bfc2f11721e6029fe891
+Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
+---
+ src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 17 +++--------------
+ 1 file changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+index 8a35705..d366a3c 100755
+--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+@@ -102,7 +102,6 @@ QT_USE_NAMESPACE
+     QCocoaSystemTrayIcon *systray;
+     NSStatusItem *item;
+     QCocoaMenu *menu;
+-    bool menuVisible;
+     QIcon icon;
+     QT_MANGLE_NAMESPACE(QNSImageView) *imageCell;
+ }
+@@ -202,8 +201,6 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+ 
+     m_sys->item->icon = icon;
+ 
+-    const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
+-
+     // The reccomended maximum title bar icon height is 18 points
+     // (device independent pixels). The menu height on past and
+     // current OS X versions is 22 points. Provide some future-proofing
+@@ -218,9 +215,8 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+     // devicePixelRatio for the "best" screen on the system.
+     qreal devicePixelRatio = qApp->devicePixelRatio();
+     const int maxPixmapHeight = maxImageHeight * devicePixelRatio;
+-    const QIcon::Mode mode = menuVisible ? QIcon::Selected : QIcon::Normal;
+     QSize selectedSize;
+-    Q_FOREACH (const QSize& size, sortByHeight(icon.availableSizes(mode))) {
+    Q_FOREACH (const QSize& size, sortByHeight(icon.availableSizes())) {
+         // Select a pixmap based on the height. We want the largest pixmap
+         // with a height smaller or equal to maxPixmapHeight. The pixmap
+         // may rectangular; assume it has a reasonable size. If there is
+@@ -236,9 +232,9 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+ 
+     // Handle SVG icons, which do not return anything for availableSizes().
+     if (!selectedSize.isValid())
+-        selectedSize = icon.actualSize(QSize(maxPixmapHeight, maxPixmapHeight), mode);
+        selectedSize = icon.actualSize(QSize(maxPixmapHeight, maxPixmapHeight));
+ 
+-    QPixmap pixmap = icon.pixmap(selectedSize, mode);
+    QPixmap pixmap = icon.pixmap(selectedSize);
+ 
+     // Draw a low-resolution icon if there is not enough pixels for a retina
+     // icon. This prevents showing a small icon on retina displays.
+@@ -385,9 +381,6 @@ QT_END_NAMESPACE
+     Q_UNUSED(notification);
+     down = NO;
+ 
+-    parent->systray->updateIcon(parent->icon);
+-    parent->menuVisible = false;
+-
+     [self setNeedsDisplay:YES];
+ }
+ 
+@@ -397,8 +390,6 @@ QT_END_NAMESPACE
+     int clickCount = [mouseEvent clickCount];
+     [self setNeedsDisplay:YES];
+ 
+-    parent->systray->updateIcon(parent->icon);
+-
+     if (clickCount == 2) {
+         [self menuTrackingDone:nil];
+         [parent doubleClickSelector:self];
+@@ -454,7 +445,6 @@ QT_END_NAMESPACE
+     if (self) {
+         item = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength] retain];
+         menu = 0;
+-        menuVisible = false;
+         systray = sys;
+         imageCell = [[QNSImageView alloc] initWithParent:self];
+         [item setView: imageCell];
+@@ -498,7 +488,6 @@ QT_END_NAMESPACE
+          selector:@selector(menuTrackingDone:)
+              name:NSMenuDidEndTrackingNotification
+                  object:m];
+-        menuVisible = true;
+         [item popUpStatusItemMenu: m];
+     }
+ }
+-- 
+1.9.1
+
--- a/admin/qt/patches/qtbase/0001-NOUPSTREAM-Fix-force-debug-info-with-macx-clang.patch
+++ b/admin/qt/patches/qtbase/0001-NOUPSTREAM-Fix-force-debug-info-with-macx-clang.patch
@@ -1,27 +1,30 @@
-From 96c34ce85136cbdc16ef83effa8a13137f7ae4c5 Mon Sep 17 00:00:00 2001
+From f3cd07c11e0b7327ffc629f48a89c8c457cdba75 Mon Sep 17 00:00:00 2001
 From: Jocelyn Turcotte <jturcotte@woboq.com>
 Date: Fri, 6 Mar 2015 16:12:37 +0100
-Subject: [PATCH] [NOUPSTREAM] Fix -force-debug-info with macx-clang
+Subject: [PATCH] Fix -force-debug-info with macx-clang

 ---
 mkspecs/common/clang.conf | 2 ++
 1 file changed, 2 insertions(+)

 diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
-index e003b94..e9b3291 100644
+index 2c29bb8..110d380 100644
 --- a/mkspecs/common/clang.conf
 +++ b/mkspecs/common/clang.conf
-@@ -21,11 +21,13 @@ QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_
+@@ -20,11 +20,13 @@ QMAKE_CFLAGS_ISYSTEM             = -isystem
+ QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
 QMAKE_CFLAGS_LTCG                = -flto
- QMAKE_CFLAGS_DISABLE_LTCG        = -fno-lto
 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_OPTIMIZE -g
 
 QMAKE_CXXFLAGS_PRECOMPILE        = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_CXXFLAGS_USE_PRECOMPILE    = $$QMAKE_CFLAGS_USE_PRECOMPILE
 QMAKE_CXXFLAGS_LTCG              = $$QMAKE_CFLAGS_LTCG
- QMAKE_CXXFLAGS_DISABLE_LTCG      = $$QMAKE_CFLAGS_DISABLE_LTCG
-+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_CXX11             = -std=c++11
- QMAKE_CXXFLAGS_CXX14             = -std=c++1y
- QMAKE_CXXFLAGS_CXX1Z             = -std=c++1z
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+ 
+ QMAKE_LFLAGS_CXX11      =
+ QMAKE_LFLAGS_LTCG       = $$QMAKE_CFLAGS_LTCG
+-- 
+2.2.0
+
--- a/admin/qt/patches/0007-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
+++ b/admin/qt/patches/0007-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
@@ -0,0 +1,691 @@
+From cff39fba10ffc10ee4dcfdc66ff6528eb26462d3 Mon Sep 17 00:00:00 2001
+From: Markus Goetz <markus@woboq.com>
+Date: Fri, 10 Apr 2015 14:09:53 +0200
+Subject: [PATCH] QNAM: Fix upload corruptions when server closes connection
+
+This patch fixes several upload corruptions if the server closes the connection
+while/before we send data into it. They happen inside multiple places in the HTTP
+layer and are explained in the comments.
+Corruptions are:
+* The upload byte device has an in-flight signal with pending upload data, if
+it gets reset (because server closes the connection) then the re-send of the
+request was sometimes taking this stale in-flight pending upload data.
+* Because some signals were DirectConnection and some were QueuedConnection, there
+was a chance that a direct signal overtakes a queued signal. The state machine
+then sent data down the socket which was buffered there (and sent later) although
+it did not match the current state of the state machine when it was actually sent.
+* A socket was seen as being able to have requests sent even though it was not
+encrypted yet. This relates to the previous corruption where data is stored inside
+the socket's buffer and then sent later.
+
+The included auto test produces all fixed corruptions, I detected no regressions
+via the other tests.
+This code also adds a bit of sanity checking to protect from possible further
+problems.
+
+[ChangeLog][QtNetwork] Fix HTTP(s) upload corruption when server closes connection
+
+Change-Id: I54c883925ec897050941498f139c4b523030432e
+Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk>
+---
+ src/corelib/io/qnoncontiguousbytedevice.cpp        |  18 +++
+ src/corelib/io/qnoncontiguousbytedevice_p.h        |   4 +
+ .../access/qhttpnetworkconnectionchannel.cpp       |  35 ++++-
+ .../access/qhttpnetworkconnectionchannel_p.h       |   2 +
+ src/network/access/qhttpprotocolhandler.cpp        |   7 +
+ src/network/access/qhttpthreaddelegate_p.h         |  36 ++++-
+ src/network/access/qnetworkreplyhttpimpl.cpp       |  25 ++-
+ src/network/access/qnetworkreplyhttpimpl_p.h       |   7 +-
+ .../access/qnetworkreply/tst_qnetworkreply.cpp     | 175 ++++++++++++++++++++-
+ 9 files changed, 279 insertions(+), 30 deletions(-)
+
+diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
+index 11510a8..760ca3d 100644
+--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
+@@ -236,6 +236,11 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()
+     return byteArray->size();
+ }
+ 
+qint64 QNonContiguousByteDeviceByteArrayImpl::pos()
+{
+    return currentPosition;
+}
+
+ QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb)
+     : QNonContiguousByteDevice(), currentPosition(0)
+ {
+@@ -273,6 +278,11 @@ bool QNonContiguousByteDeviceRingBufferImpl::atEnd()
+     return currentPosition >= size();
+ }
+ 
+qint64 QNonContiguousByteDeviceRingBufferImpl::pos()
+{
+    return currentPosition;
+}
+
+ bool QNonContiguousByteDeviceRingBufferImpl::reset()
+ {
+     if (resetDisabled)
+@@ -406,6 +416,14 @@ qint64 QNonContiguousByteDeviceIoDeviceImpl::size()
+     return device->size() - initialPosition;
+ }
+ 
+qint64 QNonContiguousByteDeviceIoDeviceImpl::pos()
+{
+    if (device->isSequential())
+        return -1;
+
+    return device->pos();
+}
+
+ QByteDeviceWrappingIoDevice::QByteDeviceWrappingIoDevice(QNonContiguousByteDevice *bd) : QIODevice((QObject*)0)
+ {
+     byteDevice = bd;
+diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
+index c05ae11..4d7b7b0 100644
+--- a/src/corelib/io/qnoncontiguousbytedevice_p.h
+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
+@@ -61,6 +61,7 @@ public:
+     virtual const char* readPointer(qint64 maximumLength, qint64 &len) = 0;
+     virtual bool advanceReadPointer(qint64 amount) = 0;
+     virtual bool atEnd() = 0;
+    virtual qint64 pos() { return -1; }
+     virtual bool reset() = 0;
+     void disableReset();
+     bool isResetDisabled() { return resetDisabled; }
+@@ -106,6 +107,7 @@ public:
+     bool atEnd();
+     bool reset();
+     qint64 size();
+    qint64 pos() Q_DECL_OVERRIDE;
+ protected:
+     QByteArray* byteArray;
+     qint64 currentPosition;
+@@ -121,6 +123,7 @@ public:
+     bool atEnd();
+     bool reset();
+     qint64 size();
+    qint64 pos() Q_DECL_OVERRIDE;
+ protected:
+     QSharedPointer<QRingBuffer> ringBuffer;
+     qint64 currentPosition;
+@@ -138,6 +141,7 @@ public:
+     bool atEnd();
+     bool reset();
+     qint64 size();
+    qint64 pos() Q_DECL_OVERRIDE;
+ protected:
+     QIODevice* device;
+     QByteArray* currentReadBuffer;
+diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
+index 9f63280..49c6793 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
+@@ -106,15 +106,19 @@ void QHttpNetworkConnectionChannel::init()
+     socket->setProxy(QNetworkProxy::NoProxy);
+ #endif
+ 
+    // We want all signals (except the interactive ones) be connected as QueuedConnection
+    // because else we're falling into cases where we recurse back into the socket code
+    // and mess up the state. Always going to the event loop (and expecting that when reading/writing)
+    // is safer.
+     QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
+                      this, SLOT(_q_bytesWritten(qint64)),
+-                     Qt::DirectConnection);
+                     Qt::QueuedConnection);
+     QObject::connect(socket, SIGNAL(connected()),
+                      this, SLOT(_q_connected()),
+-                     Qt::DirectConnection);
+                     Qt::QueuedConnection);
+     QObject::connect(socket, SIGNAL(readyRead()),
+                      this, SLOT(_q_readyRead()),
+-                     Qt::DirectConnection);
+                     Qt::QueuedConnection);
+ 
+     // The disconnected() and error() signals may already come
+     // while calling connectToHost().
+@@ -143,13 +147,13 @@ void QHttpNetworkConnectionChannel::init()
+         // won't be a sslSocket if encrypt is false
+         QObject::connect(sslSocket, SIGNAL(encrypted()),
+                          this, SLOT(_q_encrypted()),
+-                         Qt::DirectConnection);
+                         Qt::QueuedConnection);
+         QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
+                          this, SLOT(_q_sslErrors(QList<QSslError>)),
+                          Qt::DirectConnection);
+         QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
+                          this, SLOT(_q_encryptedBytesWritten(qint64)),
+-                         Qt::DirectConnection);
+                         Qt::QueuedConnection);
+ 
+         if (ignoreAllSslErrors)
+             sslSocket->ignoreSslErrors();
+@@ -186,8 +190,11 @@ void QHttpNetworkConnectionChannel::close()
+     // pendingEncrypt must only be true in between connected and encrypted states
+     pendingEncrypt = false;
+ 
+-    if (socket)
+    if (socket) {
+        // socket can be 0 since the host lookup is done from qhttpnetworkconnection.cpp while
+        // there is no socket yet.
+         socket->close();
+    }
+ }
+ 
+ 
+@@ -353,6 +360,14 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
+         }
+         return false;
+     }
+
+    // This code path for ConnectedState
+    if (pendingEncrypt) {
+        // Let's only be really connected when we have received the encrypted() signal. Else the state machine seems to mess up
+        // and corrupt the things sent to the server.
+        return false;
+    }
+
+     return true;
+ }
+ 
+@@ -659,6 +674,12 @@ bool QHttpNetworkConnectionChannel::isSocketReading() const
+ void QHttpNetworkConnectionChannel::_q_bytesWritten(qint64 bytes)
+ {
+     Q_UNUSED(bytes);
+    if (ssl) {
+        // In the SSL case we want to send data from encryptedBytesWritten signal since that one
+        // is the one going down to the actual network, not only into some SSL buffer.
+        return;
+    }
+
+     // bytes have been written to the socket. write even more of them :)
+     if (isSocketWriting())
+         sendRequest();
+@@ -734,7 +755,7 @@ void QHttpNetworkConnectionChannel::_q_connected()
+ 
+     // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again!
+     //channels[i].reconnectAttempts = 2;
+-    if (pendingEncrypt) {
+    if (ssl || pendingEncrypt) { // FIXME: Didn't work properly with pendingEncrypt only, we should refactor this into an EncrypingState
+ #ifndef QT_NO_SSL
+         if (connection->sslContext().isNull()) {
+             // this socket is making the 1st handshake for this connection,
+diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
+index 692c0e6..231fe11 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
+@@ -83,6 +83,8 @@ typedef QPair<QHttpNetworkRequest, QHttpNetworkReply*> HttpMessagePair;
+ class QHttpNetworkConnectionChannel : public QObject {
+     Q_OBJECT
+ public:
+    // TODO: Refactor this to add an EncryptingState (and remove pendingEncrypt).
+    // Also add an Unconnected state so IdleState does not have double meaning.
+     enum ChannelState {
+         IdleState = 0,          // ready to send request
+         ConnectingState = 1,    // connecting to host
+diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp
+index 28e10f7..3357948 100644
+--- a/src/network/access/qhttpprotocolhandler.cpp
+++ b/src/network/access/qhttpprotocolhandler.cpp
+@@ -368,6 +368,13 @@ bool QHttpProtocolHandler::sendRequest()
+                 // nothing to read currently, break the loop
+                 break;
+             } else {
+                if (m_channel->written != uploadByteDevice->pos()) {
+                    // Sanity check. This was useful in tracking down an upload corruption.
+                    qWarning() << "QHttpProtocolHandler: Internal error in sendRequest. Expected to write at position" << m_channel->written << "but read device is at" << uploadByteDevice->pos();
+                    Q_ASSERT(m_channel->written == uploadByteDevice->pos());
+                    m_connection->d_func()->emitReplyError(m_socket, m_reply, QNetworkReply::ProtocolFailure);
+                    return false;
+                }
+                 qint64 currentWriteSize = m_socket->write(readPointer, currentReadSize);
+                 if (currentWriteSize == -1 || currentWriteSize != currentReadSize) {
+                     // socket broke down
+diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
+index 1661082..b553409 100644
+--- a/src/network/access/qhttpthreaddelegate_p.h
+++ b/src/network/access/qhttpthreaddelegate_p.h
+@@ -187,6 +187,7 @@ protected:
+     QByteArray m_dataArray;
+     bool m_atEnd;
+     qint64 m_size;
+    qint64 m_pos; // to match calls of haveDataSlot with the expected position
+ public:
+     QNonContiguousByteDeviceThreadForwardImpl(bool aE, qint64 s)
+         : QNonContiguousByteDevice(),
+@@ -194,7 +195,8 @@ public:
+           m_amount(0),
+           m_data(0),
+           m_atEnd(aE),
+-          m_size(s)
+          m_size(s),
+          m_pos(0)
+     {
+     }
+ 
+@@ -202,6 +204,11 @@ public:
+     {
+     }
+ 
+    qint64 pos() Q_DECL_OVERRIDE
+    {
+        return m_pos;
+    }
+
+     const char* readPointer(qint64 maximumLength, qint64 &len)
+     {
+         if (m_amount > 0) {
+@@ -229,11 +236,10 @@ public:
+ 
+         m_amount -= a;
+         m_data += a;
+        m_pos += a;
+ 
+-        // To main thread to inform about our state
+-        emit processedData(a);
+-
+-        // FIXME possible optimization, already ask user thread for some data
+        // To main thread to inform about our state. The m_pos will be sent as a sanity check.
+        emit processedData(m_pos, a);
+ 
+         return true;
+     }
+@@ -250,10 +256,21 @@ public:
+     {
+         m_amount = 0;
+         m_data = 0;
+        m_dataArray.clear();
+
+        if (wantDataPending) {
+            // had requested the user thread to send some data (only 1 in-flight at any moment)
+            wantDataPending = false;
+        }
+ 
+         // Communicate as BlockingQueuedConnection
+         bool b = false;
+         emit resetData(&b);
+        if (b) {
+            // the reset succeeded, we're at pos 0 again
+            m_pos = 0;
+            // the HTTP code will anyway abort the request if !b.
+        }
+         return b;
+     }
+ 
+@@ -264,8 +281,13 @@ public:
+ 
+ public slots:
+     // From user thread:
+-    void haveDataSlot(QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
+    void haveDataSlot(qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
+     {
+        if (pos != m_pos) {
+            // Sometimes when re-sending a request in the qhttpnetwork* layer there is a pending haveData from the
+            // user thread on the way to us. We need to ignore it since it is the data for the wrong(later) chunk.
+            return;
+        }
+         wantDataPending = false;
+ 
+         m_dataArray = dataArray;
+@@ -285,7 +307,7 @@ signals:
+ 
+     // to main thread:
+     void wantData(qint64);
+-    void processedData(qint64);
+    void processedData(qint64 pos, qint64 amount);
+     void resetData(bool *b);
+ };
+ 
+diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
+index 4ce7303..974a101 100644
+--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
+@@ -424,6 +424,7 @@ QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
+     , synchronous(false)
+     , state(Idle)
+     , statusCode(0)
+    , uploadByteDevicePosition(false)
+     , uploadDeviceChoking(false)
+     , outgoingData(0)
+     , bytesUploaded(-1)
+@@ -863,9 +864,9 @@ void QNetworkReplyHttpImplPrivate::postRequest()
+                              q, SLOT(uploadByteDeviceReadyReadSlot()),
+                              Qt::QueuedConnection);
+ 
+-            // From main thread to user thread:
+-            QObject::connect(q, SIGNAL(haveUploadData(QByteArray,bool,qint64)),
+-                             forwardUploadDevice, SLOT(haveDataSlot(QByteArray,bool,qint64)), Qt::QueuedConnection);
+            // From user thread to http thread:
+            QObject::connect(q, SIGNAL(haveUploadData(qint64,QByteArray,bool,qint64)),
+                             forwardUploadDevice, SLOT(haveDataSlot(qint64,QByteArray,bool,qint64)), Qt::QueuedConnection);
+             QObject::connect(uploadByteDevice.data(), SIGNAL(readyRead()),
+                              forwardUploadDevice, SIGNAL(readyRead()),
+                              Qt::QueuedConnection);
+@@ -873,8 +874,8 @@ void QNetworkReplyHttpImplPrivate::postRequest()
+             // From http thread to user thread:
+             QObject::connect(forwardUploadDevice, SIGNAL(wantData(qint64)),
+                              q, SLOT(wantUploadDataSlot(qint64)));
+-            QObject::connect(forwardUploadDevice, SIGNAL(processedData(qint64)),
+-                             q, SLOT(sentUploadDataSlot(qint64)));
+            QObject::connect(forwardUploadDevice,SIGNAL(processedData(qint64, qint64)),
+                             q, SLOT(sentUploadDataSlot(qint64,qint64)));
+             QObject::connect(forwardUploadDevice, SIGNAL(resetData(bool*)),
+                     q, SLOT(resetUploadDataSlot(bool*)),
+                     Qt::BlockingQueuedConnection); // this is the only one with BlockingQueued!
+@@ -1268,12 +1269,22 @@ void QNetworkReplyHttpImplPrivate::replySslConfigurationChanged(const QSslConfig
+ void QNetworkReplyHttpImplPrivate::resetUploadDataSlot(bool *r)
+ {
+     *r = uploadByteDevice->reset();
+    if (*r) {
+        // reset our own position which is used for the inter-thread communication
+        uploadByteDevicePosition = 0;
+    }
+ }
+ 
+ // Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
+-void QNetworkReplyHttpImplPrivate::sentUploadDataSlot(qint64 amount)
+void QNetworkReplyHttpImplPrivate::sentUploadDataSlot(qint64 pos, qint64 amount)
+ {
+    if (uploadByteDevicePosition + amount != pos) {
+        // Sanity check, should not happen.
+        error(QNetworkReply::UnknownNetworkError, "");
+        return;
+    }
+     uploadByteDevice->advanceReadPointer(amount);
+    uploadByteDevicePosition += amount;
+ }
+ 
+ // Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
+@@ -1298,7 +1309,7 @@ void QNetworkReplyHttpImplPrivate::wantUploadDataSlot(qint64 maxSize)
+     QByteArray dataArray(data, currentUploadDataLength);
+ 
+     // Communicate back to HTTP thread
+-    emit q->haveUploadData(dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
+    emit q->haveUploadData(uploadByteDevicePosition, dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
+ }
+ 
+ void QNetworkReplyHttpImplPrivate::uploadByteDeviceReadyReadSlot()
+diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h
+index 77d9c5a..1940922 100644
+--- a/src/network/access/qnetworkreplyhttpimpl_p.h
+++ b/src/network/access/qnetworkreplyhttpimpl_p.h
+@@ -120,7 +120,7 @@ public:
+ 
+     Q_PRIVATE_SLOT(d_func(), void resetUploadDataSlot(bool *r))
+     Q_PRIVATE_SLOT(d_func(), void wantUploadDataSlot(qint64))
+-    Q_PRIVATE_SLOT(d_func(), void sentUploadDataSlot(qint64))
+    Q_PRIVATE_SLOT(d_func(), void sentUploadDataSlot(qint64,qint64))
+     Q_PRIVATE_SLOT(d_func(), void uploadByteDeviceReadyReadSlot())
+     Q_PRIVATE_SLOT(d_func(), void emitReplyUploadProgress(qint64, qint64))
+     Q_PRIVATE_SLOT(d_func(), void _q_cacheSaveDeviceAboutToClose())
+@@ -144,7 +144,7 @@ signals:
+ 
+     void startHttpRequestSynchronously();
+ 
+-    void haveUploadData(QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
+    void haveUploadData(const qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
+ };
+ 
+ class QNetworkReplyHttpImplPrivate: public QNetworkReplyPrivate
+@@ -195,6 +195,7 @@ public:
+     // upload
+     QNonContiguousByteDevice* createUploadByteDevice();
+     QSharedPointer<QNonContiguousByteDevice> uploadByteDevice;
+    qint64 uploadByteDevicePosition;
+     bool uploadDeviceChoking; // if we couldn't readPointer() any data at the moment
+     QIODevice *outgoingData;
+     QSharedPointer<QRingBuffer> outgoingDataBuffer;
+@@ -283,7 +284,7 @@ public:
+     // From QNonContiguousByteDeviceThreadForwardImpl in HTTP thread:
+     void resetUploadDataSlot(bool *r);
+     void wantUploadDataSlot(qint64);
+-    void sentUploadDataSlot(qint64);
+    void sentUploadDataSlot(qint64, qint64);
+ 
+     // From user's QNonContiguousByteDevice
+     void uploadByteDeviceReadyReadSlot();
+diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+index 3ccedf6..d2edf67 100644
+--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+@@ -457,6 +457,10 @@ private Q_SLOTS:
+ 
+     void putWithRateLimiting();
+ 
+#ifndef QT_NO_SSL
+    void putWithServerClosingConnectionImmediately();
+#endif
+
+     // NOTE: This test must be last!
+     void parentingRepliesToTheApp();
+ private:
+@@ -4718,18 +4722,22 @@ void tst_QNetworkReply::ioPostToHttpNoBufferFlag()
+ class SslServer : public QTcpServer {
+     Q_OBJECT
+ public:
+-    SslServer() : socket(0) {};
+    SslServer() : socket(0), m_ssl(true) {}
+     void incomingConnection(qintptr socketDescriptor) {
+         QSslSocket *serverSocket = new QSslSocket;
+         serverSocket->setParent(this);
+ 
+         if (serverSocket->setSocketDescriptor(socketDescriptor)) {
+            connect(serverSocket, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+            if (!m_ssl) {
+                emit newPlainConnection(serverSocket);
+                return;
+            }
+             QString testDataDir = QFileInfo(QFINDTESTDATA("rfc3252.txt")).absolutePath();
+             if (testDataDir.isEmpty())
+                 testDataDir = QCoreApplication::applicationDirPath();
+ 
+             connect(serverSocket, SIGNAL(encrypted()), this, SLOT(encryptedSlot()));
+-            connect(serverSocket, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+             serverSocket->setProtocol(QSsl::AnyProtocol);
+             connect(serverSocket, SIGNAL(sslErrors(QList<QSslError>)), serverSocket, SLOT(ignoreSslErrors()));
+             serverSocket->setLocalCertificate(testDataDir + "/certs/server.pem");
+@@ -4740,11 +4748,12 @@ public:
+         }
+     }
+ signals:
+-    void newEncryptedConnection();
+    void newEncryptedConnection(QSslSocket *s);
+    void newPlainConnection(QSslSocket *s);
+ public slots:
+     void encryptedSlot() {
+         socket = (QSslSocket*) sender();
+-        emit newEncryptedConnection();
+        emit newEncryptedConnection(socket);
+     }
+     void readyReadSlot() {
+         // for the incoming sockets, not the server socket
+@@ -4753,6 +4762,7 @@ public slots:
+ 
+ public:
+     QSslSocket *socket;
+    bool m_ssl;
+ };
+ 
+ // very similar to ioPostToHttpUploadProgress but for SSL
+@@ -4780,7 +4790,7 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
+     QNetworkReplyPtr reply(manager.post(request, sourceFile));
+ 
+     QSignalSpy spy(reply.data(), SIGNAL(uploadProgress(qint64,qint64)));
+-    connect(&server, SIGNAL(newEncryptedConnection()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    connect(&server, SIGNAL(newEncryptedConnection(QSslSocket*)), &QTestEventLoop::instance(), SLOT(exitLoop()));
+     connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply.data(), SLOT(ignoreSslErrors()));
+ 
+     // get the request started and the incoming socket connected
+@@ -4788,7 +4798,7 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
+     QVERIFY(!QTestEventLoop::instance().timeout());
+     QTcpSocket *incomingSocket = server.socket;
+     QVERIFY(incomingSocket);
+-    disconnect(&server, SIGNAL(newEncryptedConnection()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    disconnect(&server, SIGNAL(newEncryptedConnection(QSslSocket*)), &QTestEventLoop::instance(), SLOT(exitLoop()));
+ 
+ 
+     incomingSocket->setReadBufferSize(1*1024);
+@@ -7905,6 +7915,159 @@ void tst_QNetworkReply::putWithRateLimiting()
+ }
+ 
+ 
+#ifndef QT_NO_SSL
+
+class PutWithServerClosingConnectionImmediatelyHandler: public QObject
+{
+    Q_OBJECT
+public:
+    bool m_parsedHeaders;
+    QByteArray m_receivedData;
+    QByteArray m_expectedData;
+    QSslSocket *m_socket;
+    PutWithServerClosingConnectionImmediatelyHandler(QSslSocket *s, QByteArray expected) :m_parsedHeaders(false),  m_expectedData(expected), m_socket(s)
+    {
+        m_socket->setParent(this);
+        connect(m_socket, SIGNAL(readyRead()), SLOT(readyReadSlot()));
+        connect(m_socket, SIGNAL(disconnected()), SLOT(disconnectedSlot()));
+    }
+signals:
+    void correctFileUploadReceived();
+    void corruptFileUploadReceived();
+
+public slots:
+    void closeDelayed() {
+        m_socket->close();
+    }
+
+    void readyReadSlot()
+    {
+        QByteArray data = m_socket->readAll();
+        m_receivedData += data;
+        if (!m_parsedHeaders && m_receivedData.contains("\r\n\r\n")) {
+            m_parsedHeaders = true;
+            QTimer::singleShot(qrand()%10, this, SLOT(closeDelayed())); // simulate random network latency
+            // This server simulates a web server connection closing, e.g. because of Apaches MaxKeepAliveRequests or KeepAliveTimeout
+            // In this case QNAM needs to re-send the upload data but it had a bug which then corrupts the upload
+            // This test catches that.
+        }
+
+    }
+    void disconnectedSlot()
+    {
+        if (m_parsedHeaders) {
+            //qDebug() << m_receivedData.left(m_receivedData.indexOf("\r\n\r\n"));
+            m_receivedData = m_receivedData.mid(m_receivedData.indexOf("\r\n\r\n")+4); // check only actual data
+        }
+        if (m_receivedData.length() > 0 && !m_expectedData.startsWith(m_receivedData)) {
+            // We had received some data but it is corrupt!
+            qDebug() << "CORRUPT" << m_receivedData.count();
+
+            // Use this to track down the pattern of the corruption and conclude the source
+//            QFile a("/tmp/corrupt");
+//            a.open(QIODevice::WriteOnly);
+//            a.write(m_receivedData);
+//            a.close();
+
+//            QFile b("/tmp/correct");
+//            b.open(QIODevice::WriteOnly);
+//            b.write(m_expectedData);
+//            b.close();
+            //exit(1);
+            emit corruptFileUploadReceived();
+        } else {
+            emit correctFileUploadReceived();
+        }
+    }
+};
+
+class PutWithServerClosingConnectionImmediatelyServer: public SslServer
+{
+    Q_OBJECT
+public:
+    int m_correctUploads;
+    int m_corruptUploads;
+    int m_repliesFinished;
+    int m_expectedReplies;
+    QByteArray m_expectedData;
+    PutWithServerClosingConnectionImmediatelyServer() : SslServer(), m_correctUploads(0), m_corruptUploads(0), m_repliesFinished(0), m_expectedReplies(0)
+    {
+        QObject::connect(this, SIGNAL(newEncryptedConnection(QSslSocket*)), this, SLOT(createHandlerForConnection(QSslSocket*)));
+        QObject::connect(this, SIGNAL(newPlainConnection(QSslSocket*)), this, SLOT(createHandlerForConnection(QSslSocket*)));
+    }
+
+public slots:
+    void createHandlerForConnection(QSslSocket* s) {
+        PutWithServerClosingConnectionImmediatelyHandler *handler = new PutWithServerClosingConnectionImmediatelyHandler(s, m_expectedData);
+        handler->setParent(this);
+        QObject::connect(handler, SIGNAL(correctFileUploadReceived()), this, SLOT(increaseCorrect()));
+        QObject::connect(handler, SIGNAL(corruptFileUploadReceived()), this, SLOT(increaseCorrupt()));
+    }
+    void increaseCorrect() {
+        m_correctUploads++;
+    }
+    void increaseCorrupt() {
+        m_corruptUploads++;
+    }
+    void replyFinished() {
+        m_repliesFinished++;
+        if (m_repliesFinished == m_expectedReplies) {
+            QTestEventLoop::instance().exitLoop();
+        }
+     }
+};
+
+
+
+void tst_QNetworkReply::putWithServerClosingConnectionImmediately()
+{
+    const int numUploads = 40;
+    qint64 wantedSize = 512*1024; // 512 kB
+    QByteArray sourceFile;
+    for (int i = 0; i < wantedSize; ++i) {
+        sourceFile += (char)'a' +(i%26);
+    }
+    bool withSsl = false;
+
+    for (int s = 0; s <= 1; s++) {
+        withSsl = (s == 1);
+        // Test also needs to run several times because of 9c2ecf89
+        for (int j = 0; j < 20; j++) {
+            // emulate a minimal https server
+            PutWithServerClosingConnectionImmediatelyServer server;
+            server.m_ssl = withSsl;
+            server.m_expectedData = sourceFile;
+            server.m_expectedReplies = numUploads;
+            server.listen(QHostAddress(QHostAddress::LocalHost), 0);
+
+            for (int i = 0; i < numUploads; i++) {
+                // create the request
+                QUrl url = QUrl(QString("http%1://127.0.0.1:%2/file=%3").arg(withSsl ? "s" : "").arg(server.serverPort()).arg(i));
+                QNetworkRequest request(url);
+                QNetworkReply *reply = manager.put(request, sourceFile);
+                connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
+                connect(reply, SIGNAL(finished()), &server, SLOT(replyFinished()));
+                reply->setParent(&server);
+            }
+
+            // get the request started and the incoming socket connected
+            QTestEventLoop::instance().enterLoop(10);
+
+            //qDebug() << "correct=" << server.m_correctUploads << "corrupt=" << server.m_corruptUploads << "expected=" <<numUploads;
+
+            // Sanity check because ecause of 9c2ecf89 most replies will error out but we want to make sure at least some of them worked
+            QVERIFY(server.m_correctUploads > 5);
+            // Because actually important is that we don't get any corruption:
+            QCOMPARE(server.m_corruptUploads, 0);
+
+            server.close();
+        }
+    }
+
+
+}
+
+#endif
+ 
+ // NOTE: This test must be last testcase in tst_qnetworkreply!
+ void tst_QNetworkReply::parentingRepliesToTheApp()
+-- 
+1.9.1
+
--- a/admin/qt/patches/0007-X-Network-Fix-up-previous-corruption-patch.patch
+++ b/admin/qt/patches/0007-X-Network-Fix-up-previous-corruption-patch.patch
@@ -0,0 +1,434 @@
+From eae0cb09f1310e755c2aff7c1112f7a6c09d7a53 Mon Sep 17 00:00:00 2001
+From: Markus Goetz <markus@woboq.com>
+Date: Fri, 19 Jun 2015 15:35:34 +0200
+Subject: [PATCH] Network: Fix up previous corruption patch
+
+This is a fix-up for cff39fba10ffc10ee4dcfdc66ff6528eb26462d3.
+That patch lead to some internal state issues that lead to the QTBUG-47048
+or to QNetworkReply objects erroring with "Connection Closed" when
+the server closed the Keep-Alive connection.
+
+This patch changes the QNAM socket slot connections to be DirectConnection.
+We don't close the socket anymore in slots where it is anyway in a closed state
+afterwards. This prevents event/stack recursions.
+We also flush QSslSocket/QTcpSocket receive buffers when receiving a disconnect
+so that the developer always gets the full decrypted data from the buffers.
+
+[ChangeLog][QtNetwork] Fix HTTP issues with "Unknown Error" and "Connection Closed"
+[ChangeLog][QtNetwork][Sockets] Read OS/encrypted read buffers when connection
+closed by server.
+
+Change-Id: Ib4d6a2d0d988317e3a5356f36e8dbcee4590beed
+Task-number: QTBUG-47048
+Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
+Reviewed-by: Richard J. Moore <rich@kde.org>
+---
+ src/network/access/qhttpnetworkconnection.cpp      |   1 -
+ .../access/qhttpnetworkconnectionchannel.cpp       | 108 +++++++++++++--------
+ .../access/qhttpnetworkconnectionchannel_p.h       |   1 +
+ src/network/access/qhttpnetworkreply.cpp           |   2 +-
+ src/network/access/qhttpprotocolhandler.cpp        |   1 -
+ src/network/socket/qabstractsocket.cpp             |   7 +-
+ src/network/ssl/qsslsocket.cpp                     |   8 ++
+ src/network/ssl/qsslsocket_openssl.cpp             |   7 ++
+ .../access/qnetworkreply/tst_qnetworkreply.cpp     |   9 +-
+ 9 files changed, 94 insertions(+), 50 deletions(-)
+
+diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
+index 365ce55..543c70e 100644
+--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
+@@ -917,7 +917,6 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
+     for (int i = 0; i < channelCount; ++i) {
+         if (channels[i].resendCurrent && (channels[i].state != QHttpNetworkConnectionChannel::ClosingState)) {
+             channels[i].resendCurrent = false;
+-            channels[i].state = QHttpNetworkConnectionChannel::IdleState;
+
+             // if this is not possible, error will be emitted and connection terminated
+             if (!channels[i].resetUploadData())
+diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
+index 49c6793..e2f6307 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
+@@ -58,6 +58,11 @@ QT_BEGIN_NAMESPACE
+
+ // TODO: Put channel specific stuff here so it does not polute qhttpnetworkconnection.cpp
+
+// Because in-flight when sending a request, the server might close our connection (because the persistent HTTP
+// connection times out)
+// We use 3 because we can get a _q_error 3 times depending on the timing:
+static const int reconnectAttemptsDefault = 3;
+
+ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
+     : socket(0)
+     , ssl(false)
+@@ -69,7 +74,7 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
+     , resendCurrent(false)
+     , lastStatus(0)
+     , pendingEncrypt(false)
+-    , reconnectAttempts(2)
+    , reconnectAttempts(reconnectAttemptsDefault)
+     , authMethod(QAuthenticatorPrivate::None)
+     , proxyAuthMethod(QAuthenticatorPrivate::None)
+     , authenticationCredentialsSent(false)
+@@ -106,19 +111,18 @@ void QHttpNetworkConnectionChannel::init()
+     socket->setProxy(QNetworkProxy::NoProxy);
+ #endif
+
+-    // We want all signals (except the interactive ones) be connected as QueuedConnection
+-    // because else we're falling into cases where we recurse back into the socket code
+-    // and mess up the state. Always going to the event loop (and expecting that when reading/writing)
+-    // is safer.
+    // After some back and forth in all the last years, this is now a DirectConnection because otherwise
+    // the state inside the *Socket classes gets messed up, also in conjunction with the socket notifiers
+    // which behave slightly differently on Windows vs Linux
+     QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
+                      this, SLOT(_q_bytesWritten(qint64)),
+-                     Qt::QueuedConnection);
+                     Qt::DirectConnection);
+     QObject::connect(socket, SIGNAL(connected()),
+                      this, SLOT(_q_connected()),
+-                     Qt::QueuedConnection);
+                     Qt::DirectConnection);
+     QObject::connect(socket, SIGNAL(readyRead()),
+                      this, SLOT(_q_readyRead()),
+-                     Qt::QueuedConnection);
+                     Qt::DirectConnection);
+
+     // The disconnected() and error() signals may already come
+     // while calling connectToHost().
+@@ -129,10 +133,10 @@ void QHttpNetworkConnectionChannel::init()
+     qRegisterMetaType<QAbstractSocket::SocketError>();
+     QObject::connect(socket, SIGNAL(disconnected()),
+                      this, SLOT(_q_disconnected()),
+-                     Qt::QueuedConnection);
+                     Qt::DirectConnection);
+     QObject::connect(socket, SIGNAL(error(QAbstractSocket::SocketError)),
+                      this, SLOT(_q_error(QAbstractSocket::SocketError)),
+-                     Qt::QueuedConnection);
+                     Qt::DirectConnection);
+
+
+ #ifndef QT_NO_NETWORKPROXY
+@@ -147,13 +151,13 @@ void QHttpNetworkConnectionChannel::init()
+         // won't be a sslSocket if encrypt is false
+         QObject::connect(sslSocket, SIGNAL(encrypted()),
+                          this, SLOT(_q_encrypted()),
+-                         Qt::QueuedConnection);
+                         Qt::DirectConnection);
+         QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
+                          this, SLOT(_q_sslErrors(QList<QSslError>)),
+                          Qt::DirectConnection);
+         QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
+                          this, SLOT(_q_encryptedBytesWritten(qint64)),
+-                         Qt::QueuedConnection);
+                         Qt::DirectConnection);
+
+         if (ignoreAllSslErrors)
+             sslSocket->ignoreSslErrors();
+@@ -397,7 +401,7 @@ void QHttpNetworkConnectionChannel::allDone()
+
+     // reset the reconnection attempts after we receive a complete reply.
+     // in case of failures, each channel will attempt two reconnects before emitting error.
+-    reconnectAttempts = 2;
+    reconnectAttempts = reconnectAttemptsDefault;
+
+     // now the channel can be seen as free/idle again, all signal emissions for the reply have been done
+     if (state != QHttpNetworkConnectionChannel::ClosingState)
+@@ -651,6 +655,15 @@ void QHttpNetworkConnectionChannel::closeAndResendCurrentRequest()
+         QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+ }
+
+void QHttpNetworkConnectionChannel::resendCurrentRequest()
+{
+    requeueCurrentlyPipelinedRequests();
+    if (reply)
+        resendCurrent = true;
+    if (qobject_cast<QHttpNetworkConnection*>(connection))
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+}
+
+ bool QHttpNetworkConnectionChannel::isSocketBusy() const
+ {
+     return (state & QHttpNetworkConnectionChannel::BusyState);
+@@ -694,8 +707,8 @@ void QHttpNetworkConnectionChannel::_q_disconnected()
+         return;
+     }
+
+-    // read the available data before closing
+-    if (isSocketWaiting() || isSocketReading()) {
+    // read the available data before closing (also done in _q_error for other codepaths)
+    if ((isSocketWaiting() || isSocketReading()) && socket->bytesAvailable()) {
+         if (reply) {
+             state = QHttpNetworkConnectionChannel::ReadingState;
+             _q_receiveReply();
+@@ -707,7 +720,8 @@ void QHttpNetworkConnectionChannel::_q_disconnected()
+     state = QHttpNetworkConnectionChannel::IdleState;
+
+     requeueCurrentlyPipelinedRequests();
+-    close();
+
+    pendingEncrypt = false;
+ }
+
+
+@@ -789,11 +803,19 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+         errorCode = QNetworkReply::ConnectionRefusedError;
+         break;
+     case QAbstractSocket::RemoteHostClosedError:
+-        // try to reconnect/resend before sending an error.
+-        // while "Reading" the _q_disconnected() will handle this.
+-        if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
+        // This error for SSL comes twice in a row, first from SSL layer ("The TLS/SSL connection has been closed") then from TCP layer.
+        // Depending on timing it can also come three times in a row (first time when we try to write into a closing QSslSocket).
+        // The reconnectAttempts handling catches the cases where we can re-send the request.
+        if (!reply && state == QHttpNetworkConnectionChannel::IdleState) {
+            // Not actually an error, it is normal for Keep-Alive connections to close after some time if no request
+            // is sent on them. No need to error the other replies below. Just bail out here.
+            // The _q_disconnected will handle the possibly pipelined replies
+            return;
+        } else if (state != QHttpNetworkConnectionChannel::IdleState && state != QHttpNetworkConnectionChannel::ReadingState) {
+            // Try to reconnect/resend before sending an error.
+            // While "Reading" the _q_disconnected() will handle this.
+             if (reconnectAttempts-- > 0) {
+-                closeAndResendCurrentRequest();
+                resendCurrentRequest();
+                 return;
+             } else {
+                 errorCode = QNetworkReply::RemoteHostClosedError;
+@@ -818,24 +840,15 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+                 // we can ignore the readbuffersize as the data is already
+                 // in memory and we will not receive more data on the socket.
+                 reply->setReadBufferSize(0);
+                reply->setDownstreamLimited(false);
+                 _q_receiveReply();
+-#ifndef QT_NO_SSL
+-                if (ssl) {
+-                    // QT_NO_OPENSSL. The QSslSocket can still have encrypted bytes in the plainsocket.
+-                    // So we need to check this if the socket is a QSslSocket. When the socket is flushed
+-                    // it will force a decrypt of the encrypted data in the plainsocket.
+-                    QSslSocket *sslSocket = static_cast<QSslSocket*>(socket);
+-                    qint64 beforeFlush = sslSocket->encryptedBytesAvailable();
+-                    while (sslSocket->encryptedBytesAvailable()) {
+-                        sslSocket->flush();
+-                        _q_receiveReply();
+-                        qint64 afterFlush = sslSocket->encryptedBytesAvailable();
+-                        if (afterFlush == beforeFlush)
+-                            break;
+-                        beforeFlush = afterFlush;
+-                    }
+                if (!reply) {
+                    // No more reply assigned after the previous call? Then it had been finished successfully.
+                    requeueCurrentlyPipelinedRequests();
+                    state = QHttpNetworkConnectionChannel::IdleState;
+                    QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+                    return;
+                 }
+-#endif
+             }
+
+             errorCode = QNetworkReply::RemoteHostClosedError;
+@@ -846,7 +859,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+     case QAbstractSocket::SocketTimeoutError:
+         // try to reconnect/resend before sending an error.
+         if (state == QHttpNetworkConnectionChannel::WritingState && (reconnectAttempts-- > 0)) {
+-            closeAndResendCurrentRequest();
+            resendCurrentRequest();
+             return;
+         }
+         errorCode = QNetworkReply::TimeoutError;
+@@ -860,7 +873,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+     case QAbstractSocket::ProxyConnectionClosedError:
+         // try to reconnect/resend before sending an error.
+         if (reconnectAttempts-- > 0) {
+-            closeAndResendCurrentRequest();
+            resendCurrentRequest();
+             return;
+         }
+         errorCode = QNetworkReply::ProxyConnectionClosedError;
+@@ -868,7 +881,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+     case QAbstractSocket::ProxyConnectionTimeoutError:
+         // try to reconnect/resend before sending an error.
+         if (reconnectAttempts-- > 0) {
+-            closeAndResendCurrentRequest();
+            resendCurrentRequest();
+             return;
+         }
+         errorCode = QNetworkReply::ProxyTimeoutError;
+@@ -916,8 +929,18 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+     // send the next request
+     QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
+
+-    if (that) //signal emission triggered event loop
+-        close();
+    if (that) {
+        //signal emission triggered event loop
+        if (!socket)
+            state = QHttpNetworkConnectionChannel::IdleState;
+        else if (socket->state() == QAbstractSocket::UnconnectedState)
+            state = QHttpNetworkConnectionChannel::IdleState;
+        else
+            state = QHttpNetworkConnectionChannel::ClosingState;
+
+        // pendingEncrypt must only be true in between connected and encrypted states
+        pendingEncrypt = false;
+    }
+ }
+
+ #ifndef QT_NO_NETWORKPROXY
+@@ -941,7 +964,8 @@ void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetwor
+
+ void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead()
+ {
+-    sendRequest();
+    if (reply)
+        sendRequest();
+ }
+
+ #ifndef QT_NO_SSL
+diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
+index 231fe11..a834b7d 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
+@@ -169,6 +169,7 @@ public:
+
+     void handleUnexpectedEOF();
+     void closeAndResendCurrentRequest();
+    void resendCurrentRequest();
+
+     bool isSocketBusy() const;
+     bool isSocketWriting() const;
+diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
+index 55863a3..8b71bd8 100644
+--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
+@@ -191,7 +191,7 @@ QByteArray QHttpNetworkReply::readAny()
+         return QByteArray();
+
+     // we'll take the last buffer, so schedule another read from http
+-    if (d->downstreamLimited && d->responseData.bufferCount() == 1)
+    if (d->downstreamLimited && d->responseData.bufferCount() == 1 && !isFinished())
+         d->connection->d_func()->readMoreLater(this);
+     return d->responseData.read();
+ }
+diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp
+index 3357948..380aaac 100644
+--- a/src/network/access/qhttpprotocolhandler.cpp
+++ b/src/network/access/qhttpprotocolhandler.cpp
+@@ -250,7 +250,6 @@ bool QHttpProtocolHandler::sendRequest()
+     if (!m_reply) {
+         // heh, how should that happen!
+         qWarning() << "QAbstractProtocolHandler::sendRequest() called without QHttpNetworkReply";
+-        m_channel->state = QHttpNetworkConnectionChannel::IdleState;
+         return false;
+     }
+
+diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
+index 2666771..0e82d4a 100644
+--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
+@@ -768,6 +768,7 @@ bool QAbstractSocketPrivate::canReadNotification()
+ void QAbstractSocketPrivate::canCloseNotification()
+ {
+     Q_Q(QAbstractSocket);
+    // Note that this method is only called on Windows. Other platforms close in the canReadNotification()
+
+ #if defined (QABSTRACTSOCKET_DEBUG)
+     qDebug("QAbstractSocketPrivate::canCloseNotification()");
+@@ -777,7 +778,11 @@ void QAbstractSocketPrivate::canCloseNotification()
+     if (isBuffered) {
+         // Try to read to the buffer, if the read fail we can close the socket.
+         newBytes = buffer.size();
+-        if (!readFromSocket()) {
+        qint64 oldReadBufferMaxSize = readBufferMaxSize;
+        readBufferMaxSize = 0; // temporarily disable max read buffer, we want to empty the OS buffer
+        bool hadReadFromSocket = readFromSocket();
+        readBufferMaxSize = oldReadBufferMaxSize;
+        if (!hadReadFromSocket) {
+             q->disconnectFromHost();
+             return;
+         }
+diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
+index c1fab94..2b9e923 100644
+--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
+@@ -2294,6 +2294,14 @@ void QSslSocketPrivate::_q_errorSlot(QAbstractSocket::SocketError error)
+     qCDebug(lcSsl) << "\tstate =" << q->state();
+     qCDebug(lcSsl) << "\terrorString =" << q->errorString();
+ #endif
+    // this moves encrypted bytes from plain socket into our buffer
+    if (plainSocket->bytesAvailable()) {
+        qint64 tmpReadBufferMaxSize = readBufferMaxSize;
+        readBufferMaxSize = 0; // reset temporarily so the plain sockets completely drained drained
+        transmit();
+        readBufferMaxSize = tmpReadBufferMaxSize;
+    }
+
+     q->setSocketError(plainSocket->error());
+     q->setErrorString(plainSocket->errorString());
+     emit q->error(error);
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index ac4336a..94655fe 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -1419,6 +1419,13 @@ void QSslSocketBackendPrivate::disconnected()
+ {
+     if (plainSocket->bytesAvailable() <= 0)
+         destroySslContext();
+    else {
+        // Move all bytes into the plain buffer
+        qint64 tmpReadBufferMaxSize = readBufferMaxSize;
+        readBufferMaxSize = 0; // reset temporarily so the plain socket buffer is completely drained
+        transmit();
+        readBufferMaxSize = tmpReadBufferMaxSize;
+    }
+     //if there is still buffered data in the plain socket, don't destroy the ssl context yet.
+     //it will be destroyed when the socket is deleted.
+ }
+diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+index d2edf67..138f528 100644
+--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+@@ -1051,7 +1051,7 @@ protected:
+         // clean up QAbstractSocket's residue:
+         while (client->bytesToWrite() > 0) {
+             qDebug() << "Still having" << client->bytesToWrite() << "bytes to write, doing that now";
+-            if (!client->waitForBytesWritten(2000)) {
+            if (!client->waitForBytesWritten(10000)) {
+                 qDebug() << "ERROR: FastSender:" << client->error() << "cleaning up residue";
+                 return;
+             }
+@@ -1071,7 +1071,7 @@ protected:
+             measuredSentBytes += writeNextData(client, bytesToWrite);
+
+             while (client->bytesToWrite() > 0) {
+-                if (!client->waitForBytesWritten(2000)) {
+                if (!client->waitForBytesWritten(10000)) {
+                     qDebug() << "ERROR: FastSender:" << client->error() << "during blocking write";
+                     return;
+                 }
+@@ -7946,7 +7946,7 @@ public slots:
+         m_receivedData += data;
+         if (!m_parsedHeaders && m_receivedData.contains("\r\n\r\n")) {
+             m_parsedHeaders = true;
+-            QTimer::singleShot(qrand()%10, this, SLOT(closeDelayed())); // simulate random network latency
+            QTimer::singleShot(qrand()%60, this, SLOT(closeDelayed())); // simulate random network latency
+             // This server simulates a web server connection closing, e.g. because of Apaches MaxKeepAliveRequests or KeepAliveTimeout
+             // In this case QNAM needs to re-send the upload data but it had a bug which then corrupts the upload
+             // This test catches that.
+@@ -8052,11 +8052,12 @@ void tst_QNetworkReply::putWithServerClosingConnectionImmediately()
+
+             // get the request started and the incoming socket connected
+             QTestEventLoop::instance().enterLoop(10);
+            QVERIFY(!QTestEventLoop::instance().timeout());
+
+             //qDebug() << "correct=" << server.m_correctUploads << "corrupt=" << server.m_corruptUploads << "expected=" <<numUploads;
+
+             // Sanity check because ecause of 9c2ecf89 most replies will error out but we want to make sure at least some of them worked
+-            QVERIFY(server.m_correctUploads > 5);
+            QVERIFY(server.m_correctUploads > 2);
+             // Because actually important is that we don't get any corruption:
+             QCOMPARE(server.m_corruptUploads, 0);
+
+--
+1.9.1
--- a/admin/qt/patches/0008-QNAM-Fix-reply-deadlocks-on-server-closing-connectio.patch
+++ b/admin/qt/patches/0008-QNAM-Fix-reply-deadlocks-on-server-closing-connectio.patch
@@ -0,0 +1,64 @@
+From bc32c0ebc0bc00db84ca2f28eb16ab2e5b53a1b6 Mon Sep 17 00:00:00 2001
+From: Markus Goetz <markus@woboq.com>
+Date: Fri, 24 Jul 2015 09:53:20 +0200
+Subject: [PATCH] QNAM: Fix reply deadlocks on server closing connection
+
+The _q_readyRead can also be called from readMoreLater() because we implemented
+it so that bandwidth limited reading can be implemented.
+This can lead to a race condition if the socket is closing at the specific moment
+and then deadlock the channel: It will stay unusable with a zombie request.
+The fix in QHttpProtocolaHandler checks if there is actually bytes available to read
+from the socket and only then continue.
+
+The fix in the HTTP channel needs to be done to properly finish the reply in
+cases of a server replying with HTTP/1.0 or "Connection: close".
+The delayed incovation of _q_receiveReply will properly finish up the reply.
+
+Change-Id: I19ce2ae595f91d56386cc7406ccacc9935672b6b
+Reviewed-by: Richard J. Moore <rich@kde.org>
+---
+ src/network/access/qhttpnetworkconnectionchannel.cpp | 4 ++++
+ src/network/access/qhttpprotocolhandler.cpp          | 7 ++++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
+index 7428f9b..257aa13 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
+@@ -829,11 +829,15 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
+ 
+             if (!reply->d_func()->expectContent()) {
+                 // No content expected, this is a valid way to have the connection closed by the server
+                // We need to invoke this asynchronously to make sure the state() of the socket is on QAbstractSocket::UnconnectedState
+                QMetaObject::invokeMethod(this, "_q_receiveReply", Qt::QueuedConnection);
+                 return;
+             }
+             if (reply->contentLength() == -1 && !reply->d_func()->isChunked()) {
+                 // There was no content-length header and it's not chunked encoding,
+                 // so this is a valid way to have the connection closed by the server
+                // We need to invoke this asynchronously to make sure the state() of the socket is on QAbstractSocket::UnconnectedState
+                QMetaObject::invokeMethod(this, "_q_receiveReply", Qt::QueuedConnection);
+                 return;
+             }
+             // ok, we got a disconnect even though we did not expect it
+diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp
+index ab2e3da..a208315 100644
+--- a/src/network/access/qhttpprotocolhandler.cpp
+++ b/src/network/access/qhttpprotocolhandler.cpp
+@@ -237,7 +237,12 @@ void QHttpProtocolHandler::_q_readyRead()
+     }
+ 
+     if (m_channel->isSocketWaiting() || m_channel->isSocketReading()) {
+-        m_channel->state = QHttpNetworkConnectionChannel::ReadingState;
+        if (m_socket->bytesAvailable()) {
+            // We might get a spurious call from readMoreLater()
+            // call of the QHttpNetworkConnection even while the socket is disconnecting.
+            // Therefore check if there is actually bytes available before changing the channel state.
+            m_channel->state = QHttpNetworkConnectionChannel::ReadingState;
+        }
+         if (m_reply)
+             _q_receiveReply();
+     }
+-- 
+1.9.1
+
--- a/admin/qt/patches/0009-QNAM-Assign-proper-channel-before-sslErrors-emission.patch
+++ b/admin/qt/patches/0009-QNAM-Assign-proper-channel-before-sslErrors-emission.patch
@@ -0,0 +1,33 @@
+From 63cf5d3d26a6f65938c3cdec1734eac9faaaf8cb Mon Sep 17 00:00:00 2001
+From: Markus Goetz <markus@woboq.com>
+Date: Tue, 22 Sep 2015 14:26:24 -0400
+Subject: [PATCH] QNAM: Assign proper channel before sslErrors() emission
+
+There can be a race condition where another channel connects
+and gets the sslErrors() from the socket first. Then the
+QSslConfiguration from the wrong socket (the default
+channel 0's socket) was used.
+
+Task-number: QTBUG-18722
+Change-Id: Ibbfa48c27f181563745daf540fa792a57cc09682
+Reviewed-by: Richard J. Moore <rich@kde.org>
+---
+ src/network/access/qhttpnetworkconnectionchannel.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
+index 257aa13..477cba2 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
+@@ -1066,6 +1066,8 @@ void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
+     connection->d_func()->pauseConnection();
+     if (pendingEncrypt && !reply)
+         connection->d_func()->dequeueRequest(socket);
+    if (reply) // a reply was actually dequeued.
+        reply->d_func()->connectionChannel = this; // set correct channel like in sendRequest() and queueRequest();
+     if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP) {
+         if (reply)
+             emit reply->sslErrors(errors);
+-- 
+1.9.1
+
--- a/admin/qt/patches/0010-Don-t-let-closed-http-sockets-pass-as-valid-connecti.patch
+++ b/admin/qt/patches/0010-Don-t-let-closed-http-sockets-pass-as-valid-connecti.patch
@@ -0,0 +1,121 @@
+From 0df5d079290b4c3b13e58e9397fabdc1dfdba96b Mon Sep 17 00:00:00 2001
+From: Ulf Hermann <ulf.hermann@theqtcompany.com>
+Date: Fri, 25 Sep 2015 13:23:46 +0200
+Subject: [PATCH] Don't let closed http sockets pass as valid connections
+
+A QAbstractSocket can be close()'d at any time, independently of its
+current connection state. being closed means that we cannot use it to
+read or write data, but internally it might still have some data to
+send or receive, for example to an http server. We can even get a
+connected() signal after close()'ing the socket.
+
+We need to catch this condition and mark any pending data not yet
+written to the socket for resending.
+
+Task-number: QTBUG-48326
+Change-Id: I6f61c35f2c567f2a138f8cfe9ade7fd1ec039be6
+Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
+---
+ .../access/qhttpnetworkconnectionchannel.cpp       |  7 ++-
+ .../tst_qhttpnetworkconnection.cpp                 | 54 ++++++++++++++++++++++
+ 2 files changed, 60 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
+index 293909c..b4eda34 100644
+--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
+@@ -272,7 +272,12 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
+     QAbstractSocket::SocketState socketState = socket->state();
+
+     // resend this request after we receive the disconnected signal
+-    if (socketState == QAbstractSocket::ClosingState) {
+    // If !socket->isOpen() then we have already called close() on the socket, but there was still a
+    // pending connectToHost() for which we hadn't seen a connected() signal, yet. The connected()
+    // has now arrived (as indicated by socketState != ClosingState), but we cannot send anything on
+    // such a socket anymore.
+    if (socketState == QAbstractSocket::ClosingState ||
+            (socketState != QAbstractSocket::UnconnectedState && !socket->isOpen())) {
+         if (reply)
+             resendCurrent = true;
+         return false;
+diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+index 5d072af..0d188a8 100644
+--- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+@@ -36,6 +36,7 @@
+ #include "private/qhttpnetworkconnection_p.h"
+ #include "private/qnoncontiguousbytedevice_p.h"
+ #include <QAuthenticator>
+#include <QTcpServer>
+
+ #include "../../../network-settings.h"
+
+@@ -106,6 +107,8 @@ private Q_SLOTS:
+
+     void getAndThenDeleteObject();
+     void getAndThenDeleteObject_data();
+
+    void overlappingCloseAndWrite();
+ };
+
+ tst_QHttpNetworkConnection::tst_QHttpNetworkConnection()
+@@ -1112,6 +1115,57 @@ void tst_QHttpNetworkConnection::getAndThenDeleteObject()
+     }
+ }
+
+class TestTcpServer : public QTcpServer
+{
+    Q_OBJECT
+public:
+    TestTcpServer() : errorCodeReports(0)
+    {
+        connect(this, &QTcpServer::newConnection, this, &TestTcpServer::onNewConnection);
+        QVERIFY(listen(QHostAddress::LocalHost));
+    }
+
+    int errorCodeReports;
+
+public slots:
+    void onNewConnection()
+    {
+        QTcpSocket *socket = nextPendingConnection();
+        if (!socket)
+            return;
+        // close socket instantly!
+        connect(socket, &QTcpSocket::readyRead, socket, &QTcpSocket::close);
+    }
+
+    void onReply(QNetworkReply::NetworkError code)
+    {
+        QCOMPARE(code, QNetworkReply::RemoteHostClosedError);
+        ++errorCodeReports;
+    }
+};
+
+void tst_QHttpNetworkConnection::overlappingCloseAndWrite()
+{
+    // server accepts connections, but closes the socket instantly
+    TestTcpServer server;
+    QNetworkAccessManager accessManager;
+
+    // ten requests are scheduled. All should result in an RemoteHostClosed...
+    QUrl url;
+    url.setScheme(QStringLiteral("http"));
+    url.setHost(server.serverAddress().toString());
+    url.setPort(server.serverPort());
+    for (int i = 0; i < 10; ++i) {
+        QNetworkRequest request(url);
+        QNetworkReply *reply = accessManager.get(request);
+        // Not using Qt5 connection syntax here because of overly baroque syntax to discern between
+        // different error() methods.
+        QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
+                         &server, SLOT(onReply(QNetworkReply::NetworkError)));
+    }
+
+    QTRY_COMPARE(server.errorCodeReports, 10);
+}
+
+
+ QTEST_MAIN(tst_QHttpNetworkConnection)
+--
+1.9.1
--- a/admin/qt/patches/0011-Make-sure-to-report-correct-NetworkAccessibility.patch
+++ b/admin/qt/patches/0011-Make-sure-to-report-correct-NetworkAccessibility.patch
@@ -0,0 +1,113 @@
+From c056e63cea1915667997c982f48296ce5acdcc80 Mon Sep 17 00:00:00 2001
+From: Lorn Potter <lorn.potter@gmail.com>
+Date: Tue, 2 Jun 2015 13:22:23 +1000
+Subject: [PATCH] Make sure to report correct NetworkAccessibility
+
+Task-number: QTBUG-46323
+Change-Id: Ibdeb3280091a97d785d4314340678a63e88fb219
+Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
+Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
+---
+ src/network/access/qnetworkaccessmanager.cpp | 25 +++++++++++++++++--------
+ src/network/access/qnetworkaccessmanager_p.h |  2 ++
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
+index e878feb..84931cb 100644
+--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
+@@ -472,11 +472,11 @@ QNetworkAccessManager::QNetworkAccessManager(QObject *parent)
+         // the QNetworkSession's signals
+         connect(&d->networkConfigurationManager, SIGNAL(onlineStateChanged(bool)),
+                 SLOT(_q_onlineStateChanged(bool)));
+-        // we would need all active configurations to check for
+-        // d->networkConfigurationManager.isOnline(), which is asynchronous
+-        // and potentially expensive. We can just check the configuration here
+-        d->online = (d->networkConfiguration.state() & QNetworkConfiguration::Active);
+     }
+    // we would need all active configurations to check for
+    // d->networkConfigurationManager.isOnline(), which is asynchronous
+    // and potentially expensive. We can just check the configuration here
+    d->online = (d->networkConfiguration.state() & QNetworkConfiguration::Active);
+ #endif
+ }
+ 
+@@ -946,6 +946,7 @@ QNetworkConfiguration QNetworkAccessManager::activeConfiguration() const
+ void QNetworkAccessManager::setNetworkAccessible(QNetworkAccessManager::NetworkAccessibility accessible)
+ {
+     Q_D(QNetworkAccessManager);
+    d->defaultAccessControl = false;
+ 
+     if (d->networkAccessible != accessible) {
+         NetworkAccessibility previous = networkAccessible();
+@@ -964,7 +965,6 @@ void QNetworkAccessManager::setNetworkAccessible(QNetworkAccessManager::NetworkA
+ QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccessible() const
+ {
+     Q_D(const QNetworkAccessManager);
+-
+     if (d->networkSessionRequired) {
+         QSharedPointer<QNetworkSession> networkSession(d->getNetworkSession());
+         if (networkSession) {
+@@ -975,7 +975,13 @@ QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccess
+                 return NotAccessible;
+         } else {
+             // Network accessibility is either disabled or unknown.
+-            return (d->networkAccessible == NotAccessible) ? NotAccessible : UnknownAccessibility;
+            if (d->defaultAccessControl) {
+                if (d->online)
+                    return d->networkAccessible;
+                else
+                    return NotAccessible;
+            }
+            return (d->networkAccessible);
+         }
+     } else {
+         if (d->online)
+@@ -1568,7 +1574,7 @@ void QNetworkAccessManagerPrivate::createSession(const QNetworkConfiguration &co
+     if (!networkSessionStrongRef) {
+         online = false;
+ 
+-        if (networkAccessible == QNetworkAccessManager::NotAccessible)
+        if (networkAccessible == QNetworkAccessManager::NotAccessible || !online)
+             emit q->networkAccessibleChanged(QNetworkAccessManager::NotAccessible);
+         else
+             emit q->networkAccessibleChanged(QNetworkAccessManager::UnknownAccessibility);
+@@ -1616,11 +1622,14 @@ void QNetworkAccessManagerPrivate::_q_networkSessionStateChanged(QNetworkSession
+     if (online) {
+         if (state != QNetworkSession::Connected && state != QNetworkSession::Roaming) {
+             online = false;
+-            emit q->networkAccessibleChanged(QNetworkAccessManager::NotAccessible);
+            networkAccessible = QNetworkAccessManager::NotAccessible;
+            emit q->networkAccessibleChanged(networkAccessible);
+         }
+     } else {
+         if (state == QNetworkSession::Connected || state == QNetworkSession::Roaming) {
+             online = true;
+            if (defaultAccessControl)
+                networkAccessible = QNetworkAccessManager::Accessible;
+             emit q->networkAccessibleChanged(networkAccessible);
+         }
+     }
+diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
+index f513324..c715da0 100644
+--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
+@@ -84,6 +84,7 @@ public:
+           initializeSession(true),
+ #endif
+           cookieJarCreated(false),
+          defaultAccessControl(true),
+           authenticationManager(QSharedPointer<QNetworkAccessAuthenticationManager>::create())
+     { }
+     ~QNetworkAccessManagerPrivate();
+@@ -164,6 +165,7 @@ public:
+ #endif
+ 
+     bool cookieJarCreated;
+    bool defaultAccessControl;
+ 
+     // The cache with authorization data:
+     QSharedPointer<QNetworkAccessAuthenticationManager> authenticationManager;
+-- 
+1.9.1
+
--- a/admin/qt/patches/0012-Make-sure-networkAccessibilityChanged-is-emitted.patch
+++ b/admin/qt/patches/0012-Make-sure-networkAccessibilityChanged-is-emitted.patch
@@ -0,0 +1,233 @@
+From bb281eea179d50a413f4ec1ff172d27ee48d3a41 Mon Sep 17 00:00:00 2001
+From: Lorn Potter <lorn.potter@gmail.com>
+Date: Fri, 17 Jul 2015 15:32:23 +1000
+Subject: [PATCH] Make sure networkAccessibilityChanged is emitted
+
+Task-number: QTBUG-46323
+Change-Id: I8297072b62763136f457ca6ae15282d1c22244f4
+Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
+Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
+---
+ src/network/access/qnetworkaccessmanager.cpp       | 70 +++++++++++++++-------
+ src/network/access/qnetworkaccessmanager_p.h       | 14 ++++-
+ .../tst_qnetworkaccessmanager.cpp                  | 31 +++++-----
+ 3 files changed, 77 insertions(+), 38 deletions(-)
+
+diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
+index 84931cb..f9e9513 100644
+--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
+@@ -278,7 +278,8 @@ static void ensureInitialized()
+ 
+     \snippet code/src_network_access_qnetworkaccessmanager.cpp 4
+ 
+-    Network requests can be reenabled again by calling
+    Network requests can be re-enabled again, and this property will resume to
+    reflect the actual device state by calling
+ 
+     \snippet code/src_network_access_qnetworkaccessmanager.cpp 5
+ 
+@@ -467,16 +468,12 @@ QNetworkAccessManager::QNetworkAccessManager(QObject *parent)
+     qRegisterMetaType<QSharedPointer<char> >();
+ 
+ #ifndef QT_NO_BEARERMANAGEMENT
+-    if (!d->networkSessionRequired) {
+-        // if a session is required, we track online state through
+-        // the QNetworkSession's signals
+-        connect(&d->networkConfigurationManager, SIGNAL(onlineStateChanged(bool)),
+-                SLOT(_q_onlineStateChanged(bool)));
+-    }
+-    // we would need all active configurations to check for
+-    // d->networkConfigurationManager.isOnline(), which is asynchronous
+-    // and potentially expensive. We can just check the configuration here
+-    d->online = (d->networkConfiguration.state() & QNetworkConfiguration::Active);
+    // if a session is required, we track online state through
+    // the QNetworkSession's signals if a request is already made.
+    // we need to track current accessibility state by default
+    //
+    connect(&d->networkConfigurationManager, SIGNAL(onlineStateChanged(bool)),
+            SLOT(_q_onlineStateChanged(bool)));
+ #endif
+ }
+ 
+@@ -946,7 +943,8 @@ QNetworkConfiguration QNetworkAccessManager::activeConfiguration() const
+ void QNetworkAccessManager::setNetworkAccessible(QNetworkAccessManager::NetworkAccessibility accessible)
+ {
+     Q_D(QNetworkAccessManager);
+-    d->defaultAccessControl = false;
+
+    d->defaultAccessControl = accessible == NotAccessible ? false : true;
+ 
+     if (d->networkAccessible != accessible) {
+         NetworkAccessibility previous = networkAccessible();
+@@ -965,6 +963,10 @@ void QNetworkAccessManager::setNetworkAccessible(QNetworkAccessManager::NetworkA
+ QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccessible() const
+ {
+     Q_D(const QNetworkAccessManager);
+
+    if (d->networkConfiguration.state().testFlag(QNetworkConfiguration::Undefined))
+        return UnknownAccessibility;
+
+     if (d->networkSessionRequired) {
+         QSharedPointer<QNetworkSession> networkSession(d->getNetworkSession());
+         if (networkSession) {
+@@ -1622,32 +1624,56 @@ void QNetworkAccessManagerPrivate::_q_networkSessionStateChanged(QNetworkSession
+     if (online) {
+         if (state != QNetworkSession::Connected && state != QNetworkSession::Roaming) {
+             online = false;
+-            networkAccessible = QNetworkAccessManager::NotAccessible;
+-            emit q->networkAccessibleChanged(networkAccessible);
+            if (networkAccessible != QNetworkAccessManager::NotAccessible) {
+                networkAccessible = QNetworkAccessManager::NotAccessible;
+                emit q->networkAccessibleChanged(networkAccessible);
+            }
+         }
+     } else {
+         if (state == QNetworkSession::Connected || state == QNetworkSession::Roaming) {
+             online = true;
+             if (defaultAccessControl)
+-                networkAccessible = QNetworkAccessManager::Accessible;
+-            emit q->networkAccessibleChanged(networkAccessible);
+                if (networkAccessible != QNetworkAccessManager::Accessible) {
+                    networkAccessible = QNetworkAccessManager::Accessible;
+                    emit q->networkAccessibleChanged(networkAccessible);
+                }
+         }
+     }
+ }
+ 
+ void QNetworkAccessManagerPrivate::_q_onlineStateChanged(bool isOnline)
+ {
+-    // if the user set a config, we only care whether this one is active.
+   Q_Q(QNetworkAccessManager);
+   // if the user set a config, we only care whether this one is active.
+     // Otherwise, this QNAM is online if there is an online config.
+     if (customNetworkConfiguration) {
+         online = (networkConfiguration.state() & QNetworkConfiguration::Active);
+     } else {
+-        if (isOnline && online != isOnline) {
+-            networkSessionStrongRef.clear();
+-            networkSessionWeakRef.clear();
+        if (online != isOnline) {
+            if (isOnline) {
+                networkSessionStrongRef.clear();
+                networkSessionWeakRef.clear();
+            }
+            online = isOnline;
+        }
+    }
+    if (online) {
+        if (defaultAccessControl) {
+            if (networkAccessible != QNetworkAccessManager::Accessible) {
+                networkAccessible = QNetworkAccessManager::Accessible;
+                emit q->networkAccessibleChanged(networkAccessible);
+            }
+        }
+    } else if (networkConfiguration.state().testFlag(QNetworkConfiguration::Undefined)) {
+        if (networkAccessible != QNetworkAccessManager::UnknownAccessibility) {
+            networkAccessible = QNetworkAccessManager::UnknownAccessibility;
+            emit q->networkAccessibleChanged(networkAccessible);
+        }
+    } else {
+        if (networkAccessible != QNetworkAccessManager::NotAccessible) {
+            networkAccessible = QNetworkAccessManager::NotAccessible;
+            emit q->networkAccessibleChanged(networkAccessible);
+         }
+-
+-        online = isOnline;
+     }
+ }
+ 
+diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
+index c715da0..54ae114 100644
+--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
+@@ -78,7 +78,6 @@ public:
+           customNetworkConfiguration(false),
+           networkSessionRequired(networkConfigurationManager.capabilities()
+                                  & QNetworkConfigurationManager::NetworkSessionRequired),
+-          networkAccessible(QNetworkAccessManager::Accessible),
+           activeReplyCount(0),
+           online(false),
+           initializeSession(true),
+@@ -86,7 +85,18 @@ public:
+           cookieJarCreated(false),
+           defaultAccessControl(true),
+           authenticationManager(QSharedPointer<QNetworkAccessAuthenticationManager>::create())
+-    { }
+    {
+#ifndef QT_NO_BEARERMANAGEMENT
+        // we would need all active configurations to check for
+        // d->networkConfigurationManager.isOnline(), which is asynchronous
+        // and potentially expensive. We can just check the configuration here
+        online = (networkConfiguration.state().testFlag(QNetworkConfiguration::Active));
+        if (online)
+            networkAccessible = QNetworkAccessManager::Accessible;
+        else
+            networkAccessible = QNetworkAccessManager::NotAccessible;
+#endif
+    }
+     ~QNetworkAccessManagerPrivate();
+ 
+     void _q_replyFinished();
+diff --git a/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
+index b4e4b9c..8ecb57d 100644
+--- a/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
+++ b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
+@@ -74,6 +74,10 @@ void tst_QNetworkAccessManager::networkAccessible()
+     // if there is no session, we cannot know in which state we are in
+     QNetworkAccessManager::NetworkAccessibility initialAccessibility =
+             manager.networkAccessible();
+
+    if (initialAccessibility == QNetworkAccessManager::UnknownAccessibility)
+          QSKIP("Unknown accessibility", SkipAll);
+
+     QCOMPARE(manager.networkAccessible(), initialAccessibility);
+ 
+     manager.setNetworkAccessible(QNetworkAccessManager::NotAccessible);
+@@ -94,29 +98,28 @@ void tst_QNetworkAccessManager::networkAccessible()
+     QCOMPARE(manager.networkAccessible(), initialAccessibility);
+ 
+     QNetworkConfigurationManager configManager;
+-    bool sessionRequired = (configManager.capabilities()
+-                            & QNetworkConfigurationManager::NetworkSessionRequired);
+     QNetworkConfiguration defaultConfig = configManager.defaultConfiguration();
+     if (defaultConfig.isValid()) {
+         manager.setConfiguration(defaultConfig);
+ 
+-        // the accessibility has not changed if no session is required
+-        if (sessionRequired) {
+        QCOMPARE(spy.count(), 0);
+
+        if (defaultConfig.state().testFlag(QNetworkConfiguration::Active))
+            QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::Accessible);
+        else
+            QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::NotAccessible);
+
+        manager.setNetworkAccessible(QNetworkAccessManager::NotAccessible);
+
+        if (defaultConfig.state().testFlag(QNetworkConfiguration::Active)) {
+             QCOMPARE(spy.count(), 1);
+-            QCOMPARE(spy.takeFirst().at(0).value<QNetworkAccessManager::NetworkAccessibility>(),
+-                     QNetworkAccessManager::Accessible);
+            QCOMPARE(QNetworkAccessManager::NetworkAccessibility(spy.takeFirst().at(0).toInt()),
+                     QNetworkAccessManager::NotAccessible);
+         } else {
+             QCOMPARE(spy.count(), 0);
+         }
+-        QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::Accessible);
+-
+-        manager.setNetworkAccessible(QNetworkAccessManager::NotAccessible);
+-
+-        QCOMPARE(spy.count(), 1);
+-        QCOMPARE(QNetworkAccessManager::NetworkAccessibility(spy.takeFirst().at(0).toInt()),
+-                 QNetworkAccessManager::NotAccessible);
+-        QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::NotAccessible);
+     }
+    QCOMPARE(manager.networkAccessible(), QNetworkAccessManager::NotAccessible);
+ #endif
+ }
+ 
+-- 
+1.9.1
+
--- a/admin/qt/patches/0013-Make-UnknownAccessibility-not-block-requests.patch
+++ b/admin/qt/patches/0013-Make-UnknownAccessibility-not-block-requests.patch
@@ -0,0 +1,52 @@
+From e996d68f6130847637ba287518cff1289cfa48e5 Mon Sep 17 00:00:00 2001
+From: Lorn Potter <lorn.potter@gmail.com>
+Date: Fri, 6 Nov 2015 14:22:44 +1000
+Subject: [PATCH] Make UnknownAccessibility not block requests
+
+This allows requests to proceed without needing bearer plugins.
+
+Task-number: QTBUG-49267
+Change-Id: Ie5ce188ddefebd14d666bb5846e8f93ee2925ed1
+Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
+---
+ src/network/access/qnetworkaccessmanager.cpp | 3 +--
+ src/network/access/qnetworkaccessmanager_p.h | 2 ++
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
+index 086140f..0e5870a 100644
+--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
+@@ -976,7 +976,6 @@ QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccess
+             else
+                 return NotAccessible;
+         } else {
+-            // Network accessibility is either disabled or unknown.
+             if (d->defaultAccessControl) {
+                 if (d->online)
+                     return d->networkAccessible;
+@@ -1161,7 +1160,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
+ #ifndef QT_NO_BEARERMANAGEMENT
+     // Return a disabled network reply if network access is disabled.
+     // Except if the scheme is empty or file://.
+-    if (!d->networkAccessible && !isLocalFile) {
+    if (d->networkAccessible == NotAccessible && !isLocalFile) {
+         return new QDisabledNetworkReply(this, req, op);
+     }
+ 
+diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
+index 54ae114..3fc33b5 100644
+--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
+@@ -93,6 +93,8 @@ public:
+         online = (networkConfiguration.state().testFlag(QNetworkConfiguration::Active));
+         if (online)
+             networkAccessible = QNetworkAccessManager::Accessible;
+        else if (networkConfiguration.state().testFlag(QNetworkConfiguration::Undefined))
+            networkAccessible = QNetworkAccessManager::UnknownAccessibility;
+         else
+             networkAccessible = QNetworkAccessManager::NotAccessible;
+ #endif
+-- 
+1.9.1
+
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format`