Merge lp:~zeller-benjamin/ubuntu-sdk-ide/qtc41 into lp:ubuntu-sdk-ide

[Benjamin Zeller]

New QtC 4.1 based IDE with LXD backend

New QtC 4.1 based IDE with LXD backend

[Zoltan Balogh (bzoltan)]

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:147
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/52/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5669/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/52/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:147
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/53/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5670/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/53/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-10 09:00:35 +0000
+++ CMakeLists.txt	2016-08-29 16:14:55 +0000
@@ -30,6 +30,10 @@
 set (QT_BUILD_DIR    "${CMAKE_BINARY_DIR}/qt-build/build")
 set (QT_INSTALL_DIR  "${CMAKE_BINARY_DIR}/qt")
 
+add_custom_target(RevertPatches
+                  env QUILT_PATCHES=debian/patches quilt pop -a
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
 add_custom_target(QtSource
                   ${CMAKE_SOURCE_DIR}/get_bzr_source.py -d "${QT_SOURCE_DIR}" lp:~bzoltan/+junk/qt-everywhere-opensource-src-5.6.0
                   COMMAND ${CMAKE_SOURCE_DIR}/get_package_source.py -c ${QT_SOURCE_DIR} qtfeedback-opensource-src:qtfeedback qtpim-opensource-src:qtpim
@@ -55,13 +59,18 @@
                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 add_custom_target(QtCreatorSource
-                  ${CMAKE_SOURCE_DIR}/get_bzr_source.py -d "${EXT_SOURCE_DIR}/qtcreator" lp:~zeller-benjamin/+junk/qtc-lxd
+                  ${CMAKE_SOURCE_DIR}/get_git_source.py -d "${EXT_SOURCE_DIR}/qtcreator" -b "v4.1.0" "http://code.qt.io/qt-creator/qt-creator.git"
                   COMMAND ${CMAKE_SOURCE_DIR}/get_bzr_source.py -d "${EXT_SOURCE_DIR}/qtcreator/src/plugins/ubuntu" lp:qtcreator-plugin-ubuntu
-                  COMMAND sed -i "'s/\\(welcome\\)/\\1 \\\\ \\n   ubuntu/g'" ${EXT_SOURCE_DIR}/qtcreator/src/plugins/plugins.pro
                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 add_custom_target(sources DEPENDS QtSource LibDusSource MaliitSource fcitx-qtSource AppmenuSource QtCreatorSource)
 
+add_custom_command(TARGET sources
+                   PRE_BUILD
+                   COMMAND "REVERTING ALL PATCHES"
+                   COMMAND quilt pop -a
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
 IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
     message("debug mode enabled")
     set(QT_ADDITIONAL_CONF "-debug")
@@ -72,6 +81,10 @@
     set(CMAKE_BUILD_TYPE_STRING "RelWithDebInfo")
 ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
 
+add_custom_target(ApplyPatches
+                  env QUILT_PATCHES=debian/patches quilt push -a
+                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
 ExternalProject_Add(${QT_VERSION}
   #URL http://download.qt.io/official_releases/qt/5.4/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.gz
   PREFIX      "qt-build"
@@ -82,6 +95,7 @@
   CONFIGURE_COMMAND sh -c "${CMAKE_SOURCE_DIR}/fix-qt-build.py -f \"${QT_SOURCE_DIR}\" && ${QT_SOURCE_DIR}/configure -prefix ${QT_INSTALL_DIR} ${QT_ADDITIONAL_CONF} `cat ${CMAKE_SOURCE_DIR}/qt5config`"
   BUILD_COMMAND     sh -c "make ${GENERATED_MAKE_FLAGS}"
   INSTALL_COMMAND   sh -c "make install"
+  DEPENDS     ApplyPatches
 )
 
 SET (DBUSMENU_PREFIX "${CMAKE_BINARY_DIR}/libdbusmenu-qt-build")
@@ -161,7 +175,7 @@
   BINARY_DIR  "${QTCREATOR_PREFIX}/build"
   INSTALL_DIR "${CMAKE_BINARY_DIR}/ubuntu-sdk-ide"
   DOWNLOAD_COMMAND  sh -c "exit 0"
-  CONFIGURE_COMMAND sh -c "${QT_INSTALL_DIR}/bin/qmake -r USE_SYSTEM_BOTAN=1 ${QMAKE_ADDITIONAL_CONF} ${EXT_SOURCE_DIR}/qtcreator"
+  CONFIGURE_COMMAND sh -c "${QT_INSTALL_DIR}/bin/qmake -r USE_SYSTEM_BOTAN=1 CONFIG+=debug ${QMAKE_ADDITIONAL_CONF} ${EXT_SOURCE_DIR}/qtcreator"
   BUILD_COMMAND     sh -c "QT_PRIVATE_HEADERS=${QT_INSTALL_DIR} LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make ${GENERATED_MAKE_FLAGS}"
   INSTALL_COMMAND   sh -c "QT_PRIVATE_HEADERS=${QT_INSTALL_DIR} LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/ubuntu-sdk-ide -j1 docs deployqt"
 )

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-12 13:31:23 +0000
+++ debian/changelog	2016-08-29 16:14:55 +0000
@@ -1,6 +1,7 @@
-ubuntu-sdk-ide (3.5.4) UNRELEASED; urgency=medium
+ubuntu-sdk-ide (4.1.0) trusty; urgency=medium
 
-  * LXD support 
+  * Upgrade to QtC 4.1
+  * Backend rewrite to use LXD based builders
 
  -- Benjamin Zeller <[e-mail]>  Mon, 25 Apr 2016 12:54:38 +0200
 

=== modified file 'debian/control'
--- debian/control	2016-07-13 07:43:33 +0000
+++ debian/control	2016-08-29 16:14:55 +0000
@@ -6,6 +6,7 @@
                cmake,
                dpkg-dev (>= 1.16.1),
                devscripts,
+               quilt,
                chrpath,
                doxygen,
                ca-certificates,
@@ -121,6 +122,8 @@
           qtcreator-plugin-valgrind-dev,
           qtcreator-plugin-autopilot,
           qtcreator-plugin-autopilot-dev,
+          ubuntu-sdk-dev,
+Conflicts: ubuntu-sdk-dev,
 Description: Ubuntu SDK IDE
  Qt Creator is a lightweight, cross-platform integrated development
  environment (IDE) designed to make development with the Qt application

=== added directory 'debian/patches'
=== added file 'debian/patches/always_autotect_qt_versions'
--- debian/patches/always_autotect_qt_versions	1970-01-01 00:00:00 +0000
+++ debian/patches/always_autotect_qt_versions	2016-08-29 16:14:55 +0000
@@ -0,0 +1,101 @@
+Index: qtcreator/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+===================================================================
+--- qtcreator.orig/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
++++ qtcreator/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+@@ -97,7 +97,7 @@ bool qtVersionNumberCompare(BaseQtVersio
+     return a->qtVersion() > b->qtVersion() || (a->qtVersion() == b->qtVersion() && a->uniqueId() < b->uniqueId());
+ }
+ static bool restoreQtVersions();
+-static void findSystemQt();
++static void updateSystemQt();
+ static void saveQtVersions();
+ static void updateDocumentation();
+ 
+@@ -126,14 +126,11 @@ void QtVersionManager::triggerQtVersionR
+     disconnect(ProjectExplorer::ToolChainManager::instance(), SIGNAL(toolChainsLoaded()),
+                this, SLOT(triggerQtVersionRestore()));
+ 
+-    bool success = restoreQtVersions();
++    restoreQtVersions();
+     m_instance->updateFromInstaller(false);
+-    if (!success) {
+-        // We did neither restore our settings or upgraded
+-        // in that case figure out if there's a qt in path
+-        // and add it to the Qt versions
+-        findSystemQt();
+-    }
++
++    // add system Qt
++    updateSystemQt();
+ 
+     emit m_instance->qtVersionsLoaded();
+     emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
+@@ -433,22 +430,57 @@ static FileNameList gatherQmakePathsFrom
+     return foundQMakes.toList();
+ }
+ 
+-static void findSystemQt()
++static void addSystemQtVersion(FileName qmake_fn)
++{
++    BaseQtVersion *v = QtVersionFactory::createQtVersionFromQMakePath(qmake_fn, true, QLatin1String("PATH"));
++    if (v) {
++        v->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmake_fn, true));
++        m_versions.insert(v->uniqueId(), v);
++    }
++}
++
++static void updateSystemQt()
+ {
+-    FileNameList systemQMakes;
+     FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
+-    if (!systemQMakePath.isEmpty())
+-        systemQMakes << systemQMakePath;
++    FileNameList qmakePathsFromQtChooser = gatherQmakePathsFromQtChooser();
++    if (!qmakePathsFromQtChooser.contains(systemQMakePath))
++        qmakePathsFromQtChooser << systemQMakePath;
++    std::sort(qmakePathsFromQtChooser.begin(), qmakePathsFromQtChooser.end());
+ 
+-    systemQMakes.append(gatherQmakePathsFromQtChooser());
++    QMap<QString, int> currentAutoVersions;
++    for (QMap<int, BaseQtVersion *>::const_iterator i = m_versions.begin(); i != m_versions.end(); ++i) {
++        if (i.value()->isAutodetected()) {
++            currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
++        }
++    }
+ 
+-    foreach (const FileName &qmakePath, Utils::filteredUnique(systemQMakes)) {
+-        BaseQtVersion *version
+-                = QtVersionFactory::createQtVersionFromQMakePath(qmakePath, false, QLatin1String("PATH"));
+-        if (version) {
+-            version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
+-            m_versions.insert(version->uniqueId(), version);
++    QMap<QString, int>::const_iterator av = currentAutoVersions.begin(); // auto-saved versions
++    FileNameList::const_iterator dv = qmakePathsFromQtChooser.begin();    // detected versions
++    while (av != currentAutoVersions.end() && dv != qmakePathsFromQtChooser.end()) {
++        if (av.key() == dv->toString()) {
++            ++av;
++            ++dv;
++        }
++        else if (av.key() < dv->toString()) {
++            // currently saved automatic version has been removed
++            m_versions.remove(*av);
++            ++av;
+         }
++        else { // av.key() > dv->toString()
++            // detected version is missing, add it
++            addSystemQtVersion(*dv);
++            ++dv;
++        }
++    }
++
++    while (av != currentAutoVersions.end()) {
++        m_versions.remove(*av);
++        ++av;
++    }
++
++    while (dv != qmakePathsFromQtChooser.end()) {
++        addSystemQtVersion(*dv);
++        ++dv;
+     }
+ }
+ 

=== added file 'debian/patches/botan_system_lib.diff'
--- debian/patches/botan_system_lib.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/botan_system_lib.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,79 @@
+Description: Use the system botan library instead of the bundled one.
+Author: Felix Geyer <[e-mail]>
+Last-Reviewed: 2014-08-19
+
+---
+ src/libs/ssh/sshcryptofacility.cpp       |    5 +++++
+ src/libs/ssh/sshcryptofacility_p.h       |    2 ++
+ src/libs/ssh/sshkeyexchange.cpp          |    6 ++++++
+ src/libs/ssh/sshkeygenerator.cpp         |    5 +++++
+ src/libs/ssh/sshkeypasswordretriever_p.h |    1 +
+ 5 files changed, 19 insertions(+)
+
+--- a/dist/qtcreator/src/libs/ssh/sshcryptofacility.cpp
++++ b/dist/qtcreator/src/libs/ssh/sshcryptofacility.cpp
+@@ -34,6 +34,11 @@
+ #include "sshpacket_p.h"
+ 
+ #include <botan/botan.h>
++#include <botan/cbc.h>
++#include <botan/dsa.h>
++#include <botan/pkcs8.h>
++#include <botan/pubkey.h>
++#include <botan/rsa.h>
+ 
+ #include <QDebug>
+ #include <QList>
+--- a/dist/qtcreator/src/libs/ssh/sshcryptofacility_p.h
++++ b/dist/qtcreator/src/libs/ssh/sshcryptofacility_p.h
+@@ -27,9 +27,11 @@
+ #define SSHCRYPTOFACILITY_P_H
+ 
+ #include <botan/botan.h>
++#include <botan/hmac.h>
+ 
+ #include <QByteArray>
+ #include <QScopedPointer>
++#include <QSharedPointer>
+ 
+ namespace QSsh {
+ namespace Internal {
+--- a/dist/qtcreator/src/libs/ssh/sshkeyexchange.cpp
++++ b/dist/qtcreator/src/libs/ssh/sshkeyexchange.cpp
+@@ -34,6 +34,12 @@
+ #include "sshincomingpacket_p.h"
+ 
+ #include <botan/botan.h>
++#include <botan/dh.h>
++#include <botan/dl_group.h>
++#include <botan/dsa.h>
++#include <botan/pem.h>
++#include <botan/pubkey.h>
++#include <botan/rsa.h>
+ 
+ #include <string>
+ 
+--- a/dist/qtcreator/src/libs/ssh/sshkeygenerator.cpp
++++ b/dist/qtcreator/src/libs/ssh/sshkeygenerator.cpp
+@@ -32,6 +32,11 @@
+ #include "sshpacket_p.h"
+ 
+ #include <botan/botan.h>
++#include <botan/der_enc.h>
++#include <botan/dsa.h>
++#include <botan/pem.h>
++#include <botan/pkcs8.h>
++#include <botan/rsa.h>
+ 
+ #include <QDateTime>
+ #include <QInputDialog>
+--- a/dist/qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
++++ b/dist/qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
+@@ -27,6 +27,7 @@
+ #define KEYPASSWORDRETRIEVER_H
+ 
+ #include <botan/botan.h>
++#include <botan/ui.h>
+ 
+ #include <string>
+ 

=== added file 'debian/patches/cmake_ubuntuspecificbits.diff'
--- debian/patches/cmake_ubuntuspecificbits.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/cmake_ubuntuspecificbits.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,109 @@
+--- a/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
++++ b/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+@@ -165,10 +165,10 @@
+     proc->setWorkingDirectory(buildDirectoryPath);
+     proc->setEnvironment(env);
+ 
+-    const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ?
+-                QString(QLatin1Char('.')) : sourceDirectory;
++    //const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ?
++    //            QString(QLatin1Char('.')) : sourceDirectory;
+     QString args;
+-    Utils::QtcProcess::addArg(&args, srcdir);
++    Utils::QtcProcess::addArg(&args, sourceDirectory);
+     Utils::QtcProcess::addArgs(&args, arguments);
+ 
+     proc->setCommand(executable, args);
+--- a/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
++++ b/dist/qtcreator/src/plugins/qmlprojectmanager/qmlproject.cpp
+@@ -288,9 +288,10 @@
+ bool QmlProject::supportsKit(Kit *k, QString *errorMessage) const
+ {
+     Id deviceType = DeviceTypeKitInformation::deviceTypeId(k);
+-    if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
++    if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE &&
++            !deviceType.toString().startsWith(QStringLiteral("UbuntuProjectManager.DeviceTypeId"))) {
+         if (errorMessage)
+-            *errorMessage = tr("Device type is not desktop.");
++            *errorMessage = tr("Device type is not desktop or Ubuntu.");
+         return false;
+     }
+ 
+--- a/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
++++ b/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+@@ -2024,6 +2024,7 @@
+         result->newVarValues[AndroidExtraLibs] = input.readerExact->values(QLatin1String("ANDROID_EXTRA_LIBS"));
+         result->newVarValues[IsoIconsVar] = input.readerExact->values(QLatin1String("ISO_ICONS"));
+         result->newVarValues[QmakeProjectName] = input.readerExact->values(QLatin1String("QMAKE_PROJECT_NAME"));
++        result->newVarValues[UbuntuManifestFile] = input.readerExact->values(QLatin1String("UBUNTU_MANIFEST_FILE"));
+ 
+         result->isDeployable = false;
+         if (result->projectType == ApplicationTemplate) {
+--- a/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
++++ b/dist/qtcreator/src/plugins/qmakeprojectmanager/qmakenodes.h
+@@ -107,7 +107,8 @@
+     AndroidPackageSourceDir,
+     AndroidExtraLibs,
+     IsoIconsVar,
+-    QmakeProjectName
++    QmakeProjectName,
++    UbuntuManifestFile
+ };
+ 
+ namespace Internal {
+--- a/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
++++ b/dist/qtcreator/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
+@@ -25,6 +25,8 @@
+ 
+ #pragma once
+ 
++#include "cmake_global.h"
++
+ #include <QByteArray>
+ #include <QList>
+ 
+@@ -34,7 +36,7 @@
+ 
+ namespace CMakeProjectManager {
+ 
+-class CMakeConfigItem {
++class CMAKE_EXPORT CMakeConfigItem {
+ public:
+     enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC };
+     CMakeConfigItem();
+--- a/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
++++ b/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+@@ -568,6 +568,11 @@
+     return m_versions.contains(id);
+ }
+ 
++void QtVersionManager::triggerDocumentationUpdate()
++{
++    updateDocumentation();
++}
++
+ BaseQtVersion *QtVersionManager::version(int id)
+ {
+     QTC_ASSERT(isLoaded(), return 0);
+--- a/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
++++ b/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.h
+@@ -63,6 +63,7 @@
+     static void removeVersion(BaseQtVersion *version);
+ 
+     static bool isValidId(int id);
++    static void triggerDocumentationUpdate ();
+ 
+ signals:
+     // content of BaseQtVersion objects with qmake path might have changed
+--- a/dist/qtcreator/src/plugins/plugins.pro
++++ b/dist/qtcreator/src/plugins/plugins.pro
+@@ -56,7 +56,8 @@
+     winrt \
+     qmlprofiler \
+     updateinfo \
+-    welcome
++    welcome \
++    ubuntu
+ 
+ DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER)
+ isEmpty(DO_NOT_BUILD_QMLDESIGNER) {

=== added file 'debian/patches/fix_documentation_path.diff'
--- debian/patches/fix_documentation_path.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_documentation_path.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,17 @@
+---
+ src/plugins/coreplugin/icore.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qtcreator/dist/qtcreator/src/plugins/coreplugin/icore.cpp
+===================================================================
+--- qtcreator.orig/dist/qtcreator/src/plugins/coreplugin/icore.cpp
++++ qtcreator/dist/qtcreator/src/plugins/coreplugin/icore.cpp
+@@ -420,7 +420,7 @@ QString ICore::userResourcePath()
+ QString ICore::documentationPath()
+ {
+     const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
+-                                            ? "/../Resources/doc" : "/../share/doc/qtcreator");
++                                            ? "/../Resources/doc" : "/../share/qtcreator/doc");
+     return QDir::cleanPath(QCoreApplication::applicationDirPath() + docPath);
+ }
+ 

=== added file 'debian/patches/fix_qt_version_autodetection.diff'
--- debian/patches/fix_qt_version_autodetection.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_qt_version_autodetection.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,41 @@
+Author: Benjamin Zeller <[e-mail]>
+Description: Fix piling up of Qt configurations.
+ The current Debian Qt autodetection patch registers a "new" Qt version 
+ on each Qt Creator startup. This fixes it.
+Last-Update: 2015-11-02
+Forwarded: no
+
+Index: qtcreator/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+===================================================================
+--- qtcreator.orig/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
++++ qtcreator/dist/qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+@@ -449,7 +449,7 @@ static void updateSystemQt()
+ 
+     QMap<QString, int> currentAutoVersions;
+     for (QMap<int, BaseQtVersion *>::const_iterator i = m_versions.begin(); i != m_versions.end(); ++i) {
+-        if (i.value()->isAutodetected()) {
++        if (i.value()->isAutodetected() && !i.value()->autodetectionSource().startsWith(QLatin1String("SDK."))) {
+             currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
+         }
+     }
+Index: qtcreator/dist/qtcreator/src/libs/utils/buildablehelperlibrary.cpp
+===================================================================
+--- qtcreator.orig/dist/qtcreator/src/libs/utils/buildablehelperlibrary.cpp
++++ qtcreator/dist/qtcreator/src/libs/utils/buildablehelperlibrary.cpp
+@@ -83,8 +83,15 @@ FileName BuildableHelperLibrary::findSys
+ 
+         if (dir.exists(qmake)) {
+             const QString qmakePath = dir.absoluteFilePath(qmake);
+-            if (isQmake(qmakePath))
++            if (isQmake(qmakePath)) {
++                QFileInfo fi(qmakePath);
++                if (BuildableHelperLibrary::isQtChooser(fi)) {
++                    const QString qtChooserPath = BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget());
++                    if (!qtChooserPath.isEmpty())
++                        return FileName::fromString(qtChooserPath);
++                }
+                 return FileName::fromString(qmakePath);
++            }
+         }
+ 
+         // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse order.

=== added file 'debian/patches/from_header_to_body.diff'
=== added file 'debian/patches/missing_header.diff'
--- debian/patches/missing_header.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/missing_header.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,12 @@
+Index: qtcreator/dist/qtcreator/src/libs/ssh/sshcryptofacility.cpp
+===================================================================
+--- qtcreator.orig/dist/qtcreator/src/libs/ssh/sshcryptofacility.cpp
++++ qtcreator/dist/qtcreator/src/libs/ssh/sshcryptofacility.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include <botan/botan.h>
+ #include <botan/cbc.h>
++#include <botan/ctr.h>
+ #include <botan/dsa.h>
+ #include <botan/pkcs8.h>
+ #include <botan/pubkey.h>

=== added file 'debian/patches/remove_libexec.diff'
--- debian/patches/remove_libexec.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/remove_libexec.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,36 @@
+Index: qtcreator/dist/qtcreator/qtcreator.pri
+===================================================================
+--- qtcreator.orig/dist/qtcreator/qtcreator.pri
++++ qtcreator/dist/qtcreator/qtcreator.pri
+@@ -108,7 +108,7 @@ osx {
+     win32: \
+         IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
+     else: \
+-        IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator
++        IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH/libexec
+     !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
+ 
+     LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
+@@ -119,7 +119,7 @@ osx {
+     win32: \
+         INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
+     else: \
+-        INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
++        INSTALL_LIBEXEC_PATH = $$INSTALL_LIBRARY_PATH/libexec
+     INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
+     INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
+     INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
+Index: qtcreator/dist/qtcreator/src/plugins/coreplugin/icore.cpp
+===================================================================
+--- qtcreator.orig/dist/qtcreator/src/plugins/coreplugin/icore.cpp
++++ qtcreator/dist/qtcreator/src/plugins/coreplugin/icore.cpp
+@@ -441,7 +441,8 @@ QString ICore::libexecPath()
+     case Utils::OsTypeLinux:
+     case Utils::OsTypeOtherUnix:
+     case Utils::OsTypeOther:
+-        path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator");
++        path = QCoreApplication::applicationDirPath()
++             + QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator/libexec");
+         break;
+     }
+     return QDir::cleanPath(path);

=== added file 'debian/patches/rpath_nonlinux.diff'
--- debian/patches/rpath_nonlinux.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/rpath_nonlinux.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,54 @@
+Author: Pino Toscano <[e-mail]>
+Description: Enable RPATH also on kFreeBSD and Hurd
+ qtcreator's plugins use RPATH to locate the qtcreator libraries, so enable it
+ also on kFreeBSD and Hurd.
+Last-Update: 2014-08-19
+Forwarded: no
+
+---
+ src/qtcreatorplugin.pri                         |    2 +-
+ src/rpath.pri                                   |    2 +-
+ src/tools/qtcreatorwidgets/qtcreatorwidgets.pro |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/dist/qtcreator/src/rpath.pri
++++ b/dist/qtcreator/src/rpath.pri
+@@ -1,6 +1,6 @@
+ macx {
+     QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
+-} else:linux-* {
++} else:linux-*|glibc-*|hurd-* {
+     #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+     # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
+     QMAKE_RPATHDIR += \$\$ORIGIN
+--- a/dist/qtcreator/src/qtcreatorplugin.pri
++++ b/dist/qtcreator/src/qtcreatorplugin.pri
+@@ -91,7 +91,7 @@ contains(QT_CONFIG, reduce_exports):CONF
+ 
+ TEMPLATE = lib
+ CONFIG += plugin plugin_with_soname
+-linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
++linux*|glibc-*|hurd-*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+ 
+ !macx {
+     target.path = $$INSTALL_PLUGIN_PATH
+--- a/dist/qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
++++ b/dist/qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+@@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {
+     IDE_LIBRARY_BASENAME = lib
+ }
+ 
+-linux-*||win32 {
++linux-*||win32||glibc-*||hurd-* {
+   # form abs path to qtcreator lib dir
+   QTC_LIBS=$$dirname(OUT_PWD)
+   QTC_LIBS=$$dirname(QTC_LIBS)
+@@ -21,7 +21,7 @@ linux-*||win32 {
+   QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
+ }
+ 
+-linux-*{  
++linux-*|glibc-*|hurd-*{
+   QMAKE_RPATHDIR *= $$QTC_LIBS
+ }
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2016-08-29 16:14:55 +0000
@@ -0,0 +1,12 @@
+rpath_nonlinux.diff
+
+# Debian patches.
+botan_system_lib.diff
+always_autotect_qt_versions
+fix_qt_version_autodetection.diff
+missing_header.diff
+fix_documentation_path.diff
+# remove_libexec.diff
+# Ubuntu patches.
+skip_failing_unit_tests.diff
+cmake_ubuntuspecificbits.diff

=== added file 'debian/patches/skip_failing_unit_tests.diff'
--- debian/patches/skip_failing_unit_tests.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/skip_failing_unit_tests.diff	2016-08-29 16:14:55 +0000
@@ -0,0 +1,32 @@
+Index: qtcreator/dist/qtcreator/tests/auto/auto.pro
+===================================================================
+--- qtcreator.orig/dist/qtcreator/tests/auto/auto.pro	2014-04-08 10:18:58.684264000 +0000
++++ qtcreator/dist/qtcreator/tests/auto/auto.pro	2014-04-08 10:20:30.671316474 +0000
+@@ -4,10 +4,8 @@
+     changeset \
+     clangstaticanalyzer \
+     cplusplus \
+-    debugger \
+     diff \
+-    extensionsystem \
+     externaltool \
+     environment \
+     generichighlighter \
+     profilewriter \
+@@ -15,11 +13,13 @@
+     qtcprocess \
+     json \
+     utils \
+-    filesearch \
+     mapreduce \
+     runextensions \
+-    sdktool \
+-    valgrind
++    filesearch
++
++!unix:SUBDIRS += debugger
++!unix:SUBDIRS += extensionsystem
++!unix:SUBDIRS += valgrind
+ 
+ qtHaveModule(qml): SUBDIRS += qml
+ qtHaveModule(quick): SUBDIRS += timeline

=== added file 'debian/quiltrc'
--- debian/quiltrc	1970-01-01 00:00:00 +0000
+++ debian/quiltrc	2016-08-29 16:14:55 +0000
@@ -0,0 +1,5 @@
+QUILT_PATCHES="debian/patches"
+QUILT_PATCH_OPTS="--reject-format=unified"
+QUILT_DIFF_ARGS="--no-timestamps --no-index"
+QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab --diffstat"
+QUILT_DIFF_OPTS="-p"

=== modified file 'debian/rules'
--- debian/rules	2015-12-16 09:18:24 +0000
+++ debian/rules	2016-08-29 16:14:55 +0000
@@ -27,4 +27,4 @@
 	dh_auto_install --destdir=../../debian/tmp/usr
 
 override_dh_shlibdeps:
-	dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib
+	dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib/Qt/lib

=== modified file 'debian/ubuntu-sdk-ide.install'
--- debian/ubuntu-sdk-ide.install	2015-12-03 09:24:46 +0000
+++ debian/ubuntu-sdk-ide.install	2016-08-29 16:14:55 +0000
@@ -6,23 +6,6 @@
 usr/bin/ubuntu-sdk
 usr/ubuntu-sdk-ide/bin
 usr/ubuntu-sdk-ide/lib
-usr/ubuntu-sdk-ide/share/icons
-usr/ubuntu-sdk-ide/share/qtcreator/cplusplus
-usr/ubuntu-sdk-ide/share/qtcreator/debugger
-usr/ubuntu-sdk-ide/share/qtcreator/designer
-usr/ubuntu-sdk-ide/share/qtcreator/externaltools
-usr/ubuntu-sdk-ide/share/qtcreator/generic-highlighter
-usr/ubuntu-sdk-ide/share/qtcreator/glsl
-usr/ubuntu-sdk-ide/share/qtcreator/qbs
-usr/ubuntu-sdk-ide/share/qtcreator/qml
-usr/ubuntu-sdk-ide/share/qtcreator/qml-type-descriptions
-usr/ubuntu-sdk-ide/share/qtcreator/qmldesigner
-usr/ubuntu-sdk-ide/share/qtcreator/qmlicons
-usr/ubuntu-sdk-ide/share/qtcreator/schemes
-usr/ubuntu-sdk-ide/share/qtcreator/snippets
-usr/ubuntu-sdk-ide/share/qtcreator/styles
-usr/ubuntu-sdk-ide/share/qtcreator/templates
-usr/ubuntu-sdk-ide/share/qtcreator/themes
-usr/ubuntu-sdk-ide/share/qtcreator/translations
-usr/ubuntu-sdk-ide/share/qtcreator/ubuntu
-usr/ubuntu-sdk-ide/share/qtcreator/welcomescreen
+usr/ubuntu-sdk-ide/share
+usr/ubuntu-sdk-ide/libexec
+

=== modified file 'dist/qtcreator/.gitignore'
--- dist/qtcreator/.gitignore	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.gitignore	2016-08-29 16:14:55 +0000
@@ -34,13 +34,18 @@
 *.embed.manifest
 /.qmake.cache
 /.qmake.stash
+*_wrapper.sh
+*_wrapper.bat
+wrapper.sh
+wrapper.bat
 
 # qtcreator generated files
 *.pro.user*
 *.creator.user*
 *.qbs.user*
 *.qmlproject.user*
-*.json
+*.pyqtc.user*
+/src/plugins/**/*.json
 /src/app/Info.plist
 app_version.h
 /src/plugins/coreplugin/ide_version.h
@@ -182,6 +187,7 @@
 /tests/auto/ioutils/tst_ioutils
 /tests/auto/profilewriter/tst_profilewriter
 /tests/auto/qml/codemodel/check/tst_codemodel_check
+/tests/auto/qml/codemodel/dependencies/tst_dependencies
 /tests/auto/qml/persistenttrie/tst_trie_check
 /tests/auto/qml/qmldesigner/bauhaustests/tst_bauhaus
 /tests/auto/qml/qmldesigner/coretests/tst_qmldesigner_core
@@ -195,6 +201,7 @@
 /tests/auto/treeviewfind/tst_treeviewfind
 /tests/auto/utils/ansiescapecodehandler/tst_ansiescapecodehandler
 /tests/auto/utils/fileutils/tst_fileutils
+/tests/auto/utils/templateengine/tst_templateengine
 /tests/auto/utils_stringutils/tst_utils_stringutils
 /tests/auto/valgrind/callgrind/tst_callgrindparsertests
 /tests/auto/valgrind/memcheck/modeldemo
@@ -223,7 +230,6 @@
 /tests/manual/ssh/sftpfsmodel/sftpfsmodel
 /tests/manual/ssh/shell/shell
 /tests/manual/ssh/tunnel/tunnel
-/tests/manual/utils/tcpportsgatherer/tst_tcpportsgatherer
 /tests/tools/qml-ast2dot/qml-ast2dot
 /tests/valgrind/memcheck/modeldemo
 /tests/valgrind/memcheck/parsertests

=== removed directory 'dist/qtcreator/.pc'
=== removed file 'dist/qtcreator/.pc/.quilt_patches'
--- dist/qtcreator/.pc/.quilt_patches	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches

=== removed file 'dist/qtcreator/.pc/.quilt_series'
--- dist/qtcreator/.pc/.quilt_series	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series

=== removed file 'dist/qtcreator/.pc/.version'
--- dist/qtcreator/.pc/.version	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed directory 'dist/qtcreator/.pc/02_use_x-terminal-emulator.diff'
=== removed file 'dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/.timestamp'
=== removed directory 'dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/src'
=== removed directory 'dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/src/libs'
=== removed directory 'dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/src/libs/utils'
=== removed file 'dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/src/libs/utils/consoleprocess_unix.cpp'
--- dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/src/libs/utils/consoleprocess_unix.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/02_use_x-terminal-emulator.diff/src/libs/utils/consoleprocess_unix.cpp	1970-01-01 00:00:00 +0000
@@ -1,406 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "consoleprocess_p.h"
-
-#include "qtcprocess.h"
-
-#include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
-
-#include <QCoreApplication>
-#include <QTimer>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-namespace Utils {
-
-ConsoleProcessPrivate::ConsoleProcessPrivate() :
-    m_mode(ConsoleProcess::Run),
-    m_appPid(0),
-    m_stubSocket(0),
-    m_tempFile(0),
-    m_error(QProcess::UnknownError),
-    m_settings(0),
-    m_stubConnected(false),
-    m_stubPid(0),
-    m_stubConnectTimer(0)
-{
-}
-
-ConsoleProcess::ConsoleProcess(QObject *parent)  :
-    QObject(parent), d(new ConsoleProcessPrivate)
-{
-    connect(&d->m_stubServer, &QLocalServer::newConnection,
-            this, &ConsoleProcess::stubConnectionAvailable);
-
-    d->m_process.setProcessChannelMode(QProcess::ForwardedChannels);
-}
-
-qint64 ConsoleProcess::applicationMainThreadID() const
-{
-    return -1;
-}
-
-void ConsoleProcess::setSettings(QSettings *settings)
-{
-    d->m_settings = settings;
-}
-
-bool ConsoleProcess::start(const QString &program, const QString &args)
-{
-    if (isRunning())
-        return false;
-
-    d->m_errorString.clear();
-    d->m_error = QProcess::UnknownError;
-
-    QtcProcess::SplitError perr;
-    QtcProcess::Arguments pargs = QtcProcess::prepareArgs(args, &perr, HostOsInfo::hostOs(),
-                                                          &d->m_environment, &d->m_workingDir);
-    QString pcmd;
-    if (perr == QtcProcess::SplitOk) {
-        pcmd = program;
-    } else {
-        if (perr != QtcProcess::FoundMeta) {
-            emitError(QProcess::FailedToStart, tr("Quoting error in command."));
-            return false;
-        }
-        if (d->m_mode == Debug) {
-            // FIXME: QTCREATORBUG-2809
-            emitError(QProcess::FailedToStart, tr("Debugging complex shell commands in a terminal"
-                                 " is currently not supported."));
-            return false;
-        }
-        pcmd = QLatin1String("/bin/sh");
-        pargs = QtcProcess::Arguments::createUnixArgs(QStringList()
-                    << QLatin1String("-c")
-                    << (QtcProcess::quoteArg(program) + QLatin1Char(' ') + args));
-    }
-
-    QtcProcess::SplitError qerr;
-    QtcProcess::Arguments xtermArgs = QtcProcess::prepareArgs(terminalEmulator(d->m_settings), &qerr,
-                                                              HostOsInfo::hostOs(),
-                                                              &d->m_environment, &d->m_workingDir);
-    if (qerr != QtcProcess::SplitOk) {
-        emitError(QProcess::FailedToStart, qerr == QtcProcess::BadQuoting
-                          ? tr("Quoting error in terminal command.")
-                          : tr("Terminal command may not be a shell command."));
-        return false;
-    }
-
-    const QString err = stubServerListen();
-    if (!err.isEmpty()) {
-        emitError(QProcess::FailedToStart, msgCommChannelFailed(err));
-        return false;
-    }
-
-    d->m_environment.unset(QLatin1String("TERM"));
-    QStringList env = d->m_environment.toStringList();
-    if (!env.isEmpty()) {
-        d->m_tempFile = new QTemporaryFile();
-        if (!d->m_tempFile->open()) {
-            stubServerShutdown();
-            emitError(QProcess::FailedToStart, msgCannotCreateTempFile(d->m_tempFile->errorString()));
-            delete d->m_tempFile;
-            d->m_tempFile = 0;
-            return false;
-        }
-        QByteArray contents;
-        foreach (const QString &var, env) {
-            QByteArray l8b = var.toLocal8Bit();
-            contents.append(l8b.constData(), l8b.size() + 1);
-        }
-        if (d->m_tempFile->write(contents) != contents.size() || !d->m_tempFile->flush()) {
-            stubServerShutdown();
-            emitError(QProcess::FailedToStart, msgCannotWriteTempFile());
-            delete d->m_tempFile;
-            d->m_tempFile = 0;
-            return false;
-        }
-    }
-
-    QString stubPath = QCoreApplication::applicationDirPath();
-    if (HostOsInfo::isMacHost())
-        stubPath.append(QLatin1String("/../Resources/qtcreator_process_stub"));
-    else
-        stubPath.append(QLatin1String("/qtcreator_process_stub"));
-
-    QStringList allArgs = xtermArgs.toUnixArgs();
-    allArgs << stubPath
-              << modeOption(d->m_mode)
-              << d->m_stubServer.fullServerName()
-              << msgPromptToClose()
-              << workingDirectory()
-              << (d->m_tempFile ? d->m_tempFile->fileName() : QString())
-              << QString::number(getpid())
-              << pcmd << pargs.toUnixArgs();
-
-    QString xterm = allArgs.takeFirst();
-    d->m_process.start(xterm, allArgs);
-    if (!d->m_process.waitForStarted()) {
-        stubServerShutdown();
-        emitError(QProcess::UnknownError, tr("Cannot start the terminal emulator \"%1\", change the setting in the "
-                             "Environment options.").arg(xterm));
-        delete d->m_tempFile;
-        d->m_tempFile = 0;
-        return false;
-    }
-    d->m_stubConnectTimer = new QTimer(this);
-    connect(d->m_stubConnectTimer, &QTimer::timeout, this, &ConsoleProcess::stop);
-    d->m_stubConnectTimer->setSingleShot(true);
-    d->m_stubConnectTimer->start(10000);
-    d->m_executable = program;
-    return true;
-}
-
-void ConsoleProcess::killProcess()
-{
-    if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
-        d->m_stubSocket->write("k", 1);
-        d->m_stubSocket->flush();
-    }
-    d->m_appPid = 0;
-}
-
-void ConsoleProcess::killStub()
-{
-    if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
-        d->m_stubSocket->write("s", 1);
-        d->m_stubSocket->flush();
-    }
-    stubServerShutdown();
-    d->m_stubPid = 0;
-}
-
-void ConsoleProcess::detachStub()
-{
-    if (d->m_stubSocket && d->m_stubSocket->isWritable()) {
-        d->m_stubSocket->write("d", 1);
-        d->m_stubSocket->flush();
-    }
-    stubServerShutdown();
-    d->m_stubPid = 0;
-}
-
-void ConsoleProcess::stop()
-{
-    killProcess();
-    killStub();
-    if (isRunning()) {
-        d->m_process.terminate();
-        if (!d->m_process.waitForFinished(1000)) {
-            d->m_process.kill();
-            d->m_process.waitForFinished();
-        }
-    }
-}
-
-bool ConsoleProcess::isRunning() const
-{
-    return d->m_process.state() != QProcess::NotRunning
-            || (d->m_stubSocket && d->m_stubSocket->isOpen());
-}
-
-QString ConsoleProcess::stubServerListen()
-{
-    // We need to put the socket in a private directory, as some systems simply do not
-    // check the file permissions of sockets.
-    QString stubFifoDir;
-    forever {
-        {
-            QTemporaryFile tf;
-            if (!tf.open())
-                return msgCannotCreateTempFile(tf.errorString());
-            stubFifoDir = tf.fileName();
-        }
-        // By now the temp file was deleted again
-        d->m_stubServerDir = QFile::encodeName(stubFifoDir);
-        if (!::mkdir(d->m_stubServerDir.constData(), 0700))
-            break;
-        if (errno != EEXIST)
-            return msgCannotCreateTempDir(stubFifoDir, QString::fromLocal8Bit(strerror(errno)));
-    }
-    const QString stubServer  = stubFifoDir + QLatin1String("/stub-socket");
-    if (!d->m_stubServer.listen(stubServer)) {
-        ::rmdir(d->m_stubServerDir.constData());
-        return tr("Cannot create socket \"%1\": %2").arg(stubServer, d->m_stubServer.errorString());
-    }
-    return QString();
-}
-
-void ConsoleProcess::stubServerShutdown()
-{
-    if (d->m_stubSocket) {
-        readStubOutput(); // we could get the shutdown signal before emptying the buffer
-        d->m_stubSocket->disconnect(); // avoid getting queued readyRead signals
-        d->m_stubSocket->deleteLater(); // we might be called from the disconnected signal of m_stubSocket
-    }
-    d->m_stubSocket = 0;
-    if (d->m_stubServer.isListening()) {
-        d->m_stubServer.close();
-        ::rmdir(d->m_stubServerDir.constData());
-    }
-}
-
-void ConsoleProcess::stubConnectionAvailable()
-{
-    if (d->m_stubConnectTimer) {
-        delete d->m_stubConnectTimer;
-        d->m_stubConnectTimer = 0;
-    }
-    d->m_stubConnected = true;
-    emit stubStarted();
-    d->m_stubSocket = d->m_stubServer.nextPendingConnection();
-    connect(d->m_stubSocket, &QIODevice::readyRead, this, &ConsoleProcess::readStubOutput);
-    connect(d->m_stubSocket, &QLocalSocket::disconnected, this, &ConsoleProcess::stubExited);
-}
-
-static QString errorMsg(int code)
-{
-    return QString::fromLocal8Bit(strerror(code));
-}
-
-void ConsoleProcess::readStubOutput()
-{
-    while (d->m_stubSocket->canReadLine()) {
-        QByteArray out = d->m_stubSocket->readLine();
-        out.chop(1); // \n
-        if (out.startsWith("err:chdir ")) {
-            emitError(QProcess::FailedToStart, msgCannotChangeToWorkDir(workingDirectory(), errorMsg(out.mid(10).toInt())));
-        } else if (out.startsWith("err:exec ")) {
-            emitError(QProcess::FailedToStart, msgCannotExecute(d->m_executable, errorMsg(out.mid(9).toInt())));
-        } else if (out.startsWith("spid ")) {
-            delete d->m_tempFile;
-            d->m_tempFile = 0;
-
-            d->m_stubPid = out.mid(4).toInt();
-        } else if (out.startsWith("pid ")) {
-            d->m_appPid = out.mid(4).toInt();
-            emit processStarted();
-        } else if (out.startsWith("exit ")) {
-            d->m_appStatus = QProcess::NormalExit;
-            d->m_appCode = out.mid(5).toInt();
-            d->m_appPid = 0;
-            emit processStopped(d->m_appCode, d->m_appStatus);
-        } else if (out.startsWith("crash ")) {
-            d->m_appStatus = QProcess::CrashExit;
-            d->m_appCode = out.mid(6).toInt();
-            d->m_appPid = 0;
-            emit processStopped(d->m_appCode, d->m_appStatus);
-        } else {
-            emitError(QProcess::UnknownError, msgUnexpectedOutput(out));
-            d->m_stubPid = 0;
-            d->m_process.terminate();
-            break;
-        }
-    }
-}
-
-void ConsoleProcess::stubExited()
-{
-    // The stub exit might get noticed before we read the error status.
-    if (d->m_stubSocket && d->m_stubSocket->state() == QLocalSocket::ConnectedState)
-        d->m_stubSocket->waitForDisconnected();
-    stubServerShutdown();
-    d->m_stubPid = 0;
-    delete d->m_tempFile;
-    d->m_tempFile = 0;
-    if (d->m_appPid) {
-        d->m_appStatus = QProcess::CrashExit;
-        d->m_appCode = -1;
-        d->m_appPid = 0;
-        emit processStopped(d->m_appCode, d->m_appStatus); // Maybe it actually did not, but keep state consistent
-    }
-    emit stubStopped();
-}
-
-struct Terminal {
-    const char *binary;
-    const char *options;
-};
-
-static const Terminal knownTerminals[] =
-{
-    {"xterm", "-e"},
-    {"aterm", "-e"},
-    {"Eterm", "-e"},
-    {"rxvt", "-e"},
-    {"urxvt", "-e"},
-    {"xfce4-terminal", "-x"},
-    {"konsole", "-e"},
-    {"gnome-terminal", "-x"}
-};
-
-QString ConsoleProcess::defaultTerminalEmulator()
-{
-    if (HostOsInfo::isMacHost()) {
-        QString termCmd = QCoreApplication::applicationDirPath() + QLatin1String("/../Resources/scripts/openTerminal.command");
-        if (QFile(termCmd).exists())
-            return termCmd.replace(QLatin1Char(' '), QLatin1String("\\ "));
-        return QLatin1String("/usr/X11/bin/xterm");
-    }
-    const Environment env = Environment::systemEnvironment();
-    const int terminalCount = int(sizeof(knownTerminals) / sizeof(knownTerminals[0]));
-    for (int i = 0; i < terminalCount; ++i) {
-        QString result = env.searchInPath(QLatin1String(knownTerminals[i].binary)).toString();
-        if (!result.isEmpty()) {
-            result += QLatin1Char(' ');
-            result += QLatin1String(knownTerminals[i].options);
-            return result;
-        }
-    }
-    return QLatin1String("xterm -e");
-}
-
-QStringList ConsoleProcess::availableTerminalEmulators()
-{
-    QStringList result;
-    const Environment env = Environment::systemEnvironment();
-    const int terminalCount = int(sizeof(knownTerminals) / sizeof(knownTerminals[0]));
-    for (int i = 0; i < terminalCount; ++i) {
-        QString terminal = env.searchInPath(QLatin1String(knownTerminals[i].binary)).toString();
-        if (!terminal.isEmpty()) {
-            terminal += QLatin1Char(' ');
-            terminal += QLatin1String(knownTerminals[i].options);
-            result.push_back(terminal);
-        }
-    }
-    if (!result.contains(defaultTerminalEmulator()))
-        result.append(defaultTerminalEmulator());
-    result.sort();
-    return result;
-}
-
-} // namespace Utils

=== removed directory 'dist/qtcreator/.pc/always_autotect_qt_versions'
=== removed file 'dist/qtcreator/.pc/always_autotect_qt_versions/.timestamp'
=== removed directory 'dist/qtcreator/.pc/always_autotect_qt_versions/src'
=== removed directory 'dist/qtcreator/.pc/always_autotect_qt_versions/src/plugins'
=== removed directory 'dist/qtcreator/.pc/always_autotect_qt_versions/src/plugins/qtsupport'
=== removed file 'dist/qtcreator/.pc/always_autotect_qt_versions/src/plugins/qtsupport/qtversionmanager.cpp'
--- dist/qtcreator/.pc/always_autotect_qt_versions/src/plugins/qtsupport/qtversionmanager.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/always_autotect_qt_versions/src/plugins/qtsupport/qtversionmanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,637 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "qtversionmanager.h"
-
-#include "qtkitinformation.h"
-#include "qtversionfactory.h"
-#include "baseqtversion.h"
-#include "qtsupportconstants.h"
-
-#include <coreplugin/icore.h>
-#include <coreplugin/helpmanager.h>
-
-#include <extensionsystem/pluginmanager.h>
-
-#include <projectexplorer/toolchainmanager.h>
-
-#include <utils/algorithm.h>
-#include <utils/buildablehelperlibrary.h>
-#include <utils/filesystemwatcher.h>
-#include <utils/hostosinfo.h>
-#include <utils/persistentsettings.h>
-#include <utils/qtcprocess.h>
-#include <utils/qtcassert.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QSettings>
-#include <QStandardPaths>
-#include <QTextStream>
-#include <QStringList>
-#include <QTimer>
-
-using namespace Utils;
-
-namespace QtSupport {
-
-using namespace Internal;
-
-const char QTVERSION_DATA_KEY[] = "QtVersion.";
-const char QTVERSION_TYPE_KEY[] = "QtVersion.Type";
-const char QTVERSION_FILE_VERSION_KEY[] = "Version";
-const char QTVERSION_FILENAME[] = "/qtcreator/qtversion.xml";
-const char QTVERSION_LEGACY_FILENAME[] = "/qtversion.xml"; // TODO: pre 2.6, remove later
-
-static QMap<int, BaseQtVersion *> m_versions;
-static int m_idcount = 0;
-// managed by QtProjectManagerPlugin
-static QtVersionManager *m_instance = 0;
-static FileSystemWatcher *m_configFileWatcher = 0;
-static QTimer *m_fileWatcherTimer = 0;
-static PersistentSettingsWriter *m_writer = 0;
-
-enum { debug = 0 };
-
-static FileName globalSettingsFileName()
-{
-    QSettings *globalSettings = ExtensionSystem::PluginManager::globalSettings();
-    return FileName::fromString(QFileInfo(globalSettings->fileName()).absolutePath()
-                                       + QLatin1String(QTVERSION_FILENAME));
-}
-
-static FileName settingsFileName(const QString &path)
-{
-    QSettings *settings = ExtensionSystem::PluginManager::settings();
-    QFileInfo settingsLocation(settings->fileName());
-    return FileName::fromString(settingsLocation.absolutePath() + path);
-}
-
-
-// prefer newer qts otherwise compare on id
-bool qtVersionNumberCompare(BaseQtVersion *a, BaseQtVersion *b)
-{
-    return a->qtVersion() > b->qtVersion() || (a->qtVersion() == b->qtVersion() && a->uniqueId() < b->uniqueId());
-}
-static bool restoreQtVersions();
-static void findSystemQt();
-static void saveQtVersions();
-static void updateDocumentation();
-
-
-// --------------------------------------------------------------------------
-// QtVersionManager
-// --------------------------------------------------------------------------
-
-QtVersionManager::QtVersionManager()
-{
-    m_instance = this;
-    m_configFileWatcher = 0;
-    m_fileWatcherTimer = new QTimer(this);
-    m_writer = 0;
-    m_idcount = 1;
-
-    qRegisterMetaType<FileName>();
-
-    // Give the file a bit of time to settle before reading it...
-    m_fileWatcherTimer->setInterval(2000);
-    connect(m_fileWatcherTimer, SIGNAL(timeout()), SLOT(updateFromInstaller()));
-}
-
-void QtVersionManager::triggerQtVersionRestore()
-{
-    disconnect(ProjectExplorer::ToolChainManager::instance(), SIGNAL(toolChainsLoaded()),
-               this, SLOT(triggerQtVersionRestore()));
-
-    bool success = restoreQtVersions();
-    m_instance->updateFromInstaller(false);
-    if (!success) {
-        // We did neither restore our settings or upgraded
-        // in that case figure out if there's a qt in path
-        // and add it to the Qt versions
-        findSystemQt();
-    }
-
-    emit m_instance->qtVersionsLoaded();
-    emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
-    saveQtVersions();
-
-    const FileName configFileName = globalSettingsFileName();
-    if (configFileName.exists()) {
-        m_configFileWatcher = new FileSystemWatcher(m_instance);
-        connect(m_configFileWatcher, SIGNAL(fileChanged(QString)),
-                m_fileWatcherTimer, SLOT(start()));
-        m_configFileWatcher->addFile(configFileName.toString(),
-                                     FileSystemWatcher::WatchModifiedDate);
-    } // exists
-}
-
-bool QtVersionManager::delayedInitialize()
-{
-    updateDocumentation();
-    return true;
-}
-
-bool QtVersionManager::isLoaded()
-{
-    return m_writer;
-}
-
-QtVersionManager::~QtVersionManager()
-{
-    delete m_writer;
-    qDeleteAll(m_versions);
-    m_versions.clear();
-}
-
-void QtVersionManager::initialized()
-{
-    connect(ProjectExplorer::ToolChainManager::instance(), SIGNAL(toolChainsLoaded()),
-            QtVersionManager::instance(), SLOT(triggerQtVersionRestore()));
-}
-
-QtVersionManager *QtVersionManager::instance()
-{
-    return m_instance;
-}
-
-static bool restoreQtVersions()
-{
-    QTC_ASSERT(!m_writer, return false);
-    m_writer = new PersistentSettingsWriter(settingsFileName(QLatin1String(QTVERSION_FILENAME)),
-                                                   QLatin1String("QtCreatorQtVersions"));
-
-    QList<QtVersionFactory *> factories = ExtensionSystem::PluginManager::getObjects<QtVersionFactory>();
-
-    PersistentSettingsReader reader;
-    FileName filename = settingsFileName(QLatin1String(QTVERSION_FILENAME));
-
-    // Read Qt Creator 2.5 qtversions.xml once:
-    if (!filename.exists())
-        filename = settingsFileName(QLatin1String(QTVERSION_LEGACY_FILENAME));
-    if (!reader.load(filename))
-        return false;
-    QVariantMap data = reader.restoreValues();
-
-    // Check version:
-    int version = data.value(QLatin1String(QTVERSION_FILE_VERSION_KEY), 0).toInt();
-    if (version < 1)
-        return false;
-
-    const QString keyPrefix = QLatin1String(QTVERSION_DATA_KEY);
-    const QVariantMap::ConstIterator dcend = data.constEnd();
-    for (QVariantMap::ConstIterator it = data.constBegin(); it != dcend; ++it) {
-        const QString &key = it.key();
-        if (!key.startsWith(keyPrefix))
-            continue;
-        bool ok;
-        int count = key.mid(keyPrefix.count()).toInt(&ok);
-        if (!ok || count < 0)
-            continue;
-
-        const QVariantMap qtversionMap = it.value().toMap();
-        const QString type = qtversionMap.value(QLatin1String(QTVERSION_TYPE_KEY)).toString();
-
-        bool restored = false;
-        foreach (QtVersionFactory *f, factories) {
-            if (f->canRestore(type)) {
-                if (BaseQtVersion *qtv = f->restore(type, qtversionMap)) {
-                    if (m_versions.contains(qtv->uniqueId())) {
-                        // This shouldn't happen, we are restoring the same id multiple times?
-                        qWarning() << "A Qt version with id"<<qtv->uniqueId()<<"already exists";
-                        delete qtv;
-                    } else {
-                        m_versions.insert(qtv->uniqueId(), qtv);
-                        m_idcount = qtv->uniqueId() > m_idcount ? qtv->uniqueId() : m_idcount;
-                        restored = true;
-                        break;
-                    }
-                }
-            }
-        }
-        if (!restored)
-            qWarning("Warning: Unable to restore Qt version '%s' stored in %s.",
-                     qPrintable(type),
-                     qPrintable(filename.toUserOutput()));
-    }
-    ++m_idcount;
-
-    return true;
-}
-
-void QtVersionManager::updateFromInstaller(bool emitSignal)
-{
-    m_fileWatcherTimer->stop();
-
-    const FileName path = globalSettingsFileName();
-    // Handle overwritting of data:
-    if (m_configFileWatcher) {
-        m_configFileWatcher->removeFile(path.toString());
-        m_configFileWatcher->addFile(path.toString(), FileSystemWatcher::WatchModifiedDate);
-    }
-
-    QList<int> added;
-    QList<int> removed;
-    QList<int> changed;
-
-    QList<QtVersionFactory *> factories = ExtensionSystem::PluginManager::getObjects<QtVersionFactory>();
-    PersistentSettingsReader reader;
-    QVariantMap data;
-    if (reader.load(path))
-        data = reader.restoreValues();
-
-    if (debug) {
-        qDebug()<< "======= Existing Qt versions =======";
-        foreach (BaseQtVersion *version, m_versions) {
-            qDebug() << version->qmakeCommand().toString() << "id:"<<version->uniqueId();
-            qDebug() << "  autodetection source:"<< version->autodetectionSource();
-            qDebug() << "";
-        }
-        qDebug()<< "======= Adding sdk versions =======";
-    }
-
-    QStringList sdkVersions;
-
-    const QString keyPrefix = QLatin1String(QTVERSION_DATA_KEY);
-    const QVariantMap::ConstIterator dcend = data.constEnd();
-    for (QVariantMap::ConstIterator it = data.constBegin(); it != dcend; ++it) {
-        const QString &key = it.key();
-        if (!key.startsWith(keyPrefix))
-            continue;
-        bool ok;
-        int count = key.mid(keyPrefix.count()).toInt(&ok);
-        if (!ok || count < 0)
-            continue;
-
-        QVariantMap qtversionMap = it.value().toMap();
-        const QString type = qtversionMap.value(QLatin1String(QTVERSION_TYPE_KEY)).toString();
-        const QString autoDetectionSource = qtversionMap.value(QLatin1String("autodetectionSource")).toString();
-        sdkVersions << autoDetectionSource;
-        int id = -1; // see BaseQtVersion::fromMap()
-        QtVersionFactory *factory = 0;
-        foreach (QtVersionFactory *f, factories) {
-            if (f->canRestore(type))
-                factory = f;
-        }
-        if (!factory) {
-            if (debug)
-                qDebug("Warning: Unable to find factory for type '%s'", qPrintable(type));
-            continue;
-        }
-        // First try to find a existing Qt version to update
-        bool restored = false;
-        foreach (BaseQtVersion *v, m_versions) {
-            if (v->autodetectionSource() == autoDetectionSource) {
-                id = v->uniqueId();
-                if (debug)
-                    qDebug() << " Qt version found with same autodetection source" << autoDetectionSource << " => Migrating id:" << id;
-                m_versions.remove(id);
-                qtversionMap[QLatin1String(Constants::QTVERSIONID)] = id;
-                qtversionMap[QLatin1String(Constants::QTVERSIONNAME)] = v->unexpandedDisplayName();
-                delete v;
-
-                if (BaseQtVersion *qtv = factory->restore(type, qtversionMap)) {
-                    Q_ASSERT(qtv->isAutodetected());
-                    m_versions.insert(id, qtv);
-                    restored = true;
-                }
-                if (restored)
-                    changed << id;
-                else
-                    removed << id;
-            }
-        }
-        // Create a new qtversion
-        if (!restored) { // didn't replace any existing versions
-            if (debug)
-                qDebug() << " No Qt version found matching" << autoDetectionSource << " => Creating new version";
-            if (BaseQtVersion *qtv = factory->restore(type, qtversionMap)) {
-                Q_ASSERT(qtv->isAutodetected());
-                m_versions.insert(qtv->uniqueId(), qtv);
-                added << qtv->uniqueId();
-                restored = true;
-            }
-        }
-        if (!restored)
-            if (debug)
-                qDebug("Warning: Unable to update qtversion '%s' from sdk installer.",
-                       qPrintable(autoDetectionSource));
-    }
-
-    if (debug) {
-        qDebug() << "======= Before removing outdated sdk versions =======";
-        foreach (BaseQtVersion *version, m_versions) {
-            qDebug() << version->qmakeCommand().toString() << "id:"<<version->uniqueId();
-            qDebug() << "  autodetection source:"<< version->autodetectionSource();
-            qDebug() << "";
-        }
-    }
-    foreach (BaseQtVersion *qtVersion, m_versions) {
-        if (qtVersion->autodetectionSource().startsWith(QLatin1String("SDK."))) {
-            if (!sdkVersions.contains(qtVersion->autodetectionSource())) {
-                if (debug)
-                    qDebug() << "  removing version"<<qtVersion->autodetectionSource();
-                m_versions.remove(qtVersion->uniqueId());
-                removed << qtVersion->uniqueId();
-            }
-        }
-    }
-
-    if (debug) {
-        qDebug()<< "======= End result =======";
-        foreach (BaseQtVersion *version, m_versions) {
-            qDebug() << version->qmakeCommand().toString() << "id:"<<version->uniqueId();
-            qDebug() << "  autodetection source:"<< version->autodetectionSource();
-            qDebug() << "";
-        }
-    }
-    if (emitSignal)
-        emit qtVersionsChanged(added, removed, changed);
-}
-
-static void saveQtVersions()
-{
-    if (!m_writer)
-        return;
-
-    QVariantMap data;
-    data.insert(QLatin1String(QTVERSION_FILE_VERSION_KEY), 1);
-
-    int count = 0;
-    foreach (BaseQtVersion *qtv, m_versions) {
-        QVariantMap tmp = qtv->toMap();
-        if (tmp.isEmpty())
-            continue;
-        tmp.insert(QLatin1String(QTVERSION_TYPE_KEY), qtv->type());
-        data.insert(QString::fromLatin1(QTVERSION_DATA_KEY) + QString::number(count), tmp);
-        ++count;
-
-    }
-    m_writer->save(data, Core::ICore::mainWindow());
-}
-
-// Executes qtchooser with arguments in a process and returns its output
-static QList<QByteArray> runQtChooser(const QString &qtchooser, const QStringList &arguments)
-{
-    QProcess p;
-    p.start(qtchooser, arguments);
-    p.waitForFinished();
-    const bool success = p.exitCode() == 0;
-    return success ? p.readAllStandardOutput().split('\n') : QList<QByteArray>();
-}
-
-// Asks qtchooser for the qmake path of a given version
-static QString qmakePath(const QString &qtchooser, const QString &version)
-{
-    QList<QByteArray> outputs = runQtChooser(qtchooser, QStringList()
-                                             << QStringLiteral("-qt=%1").arg(version)
-                                             << QStringLiteral("-print-env"));
-    foreach (const QByteArray &output, outputs) {
-        if (output.startsWith("QTTOOLDIR=\"")) {
-            QByteArray withoutVarName = output.mid(11); // remove QTTOOLDIR="
-            withoutVarName.chop(1); // remove trailing quote
-            return QStandardPaths::findExecutable(QStringLiteral("qmake"), QStringList()
-                                                  << QString::fromLocal8Bit(withoutVarName));
-        }
-    }
-    return QString();
-}
-
-static FileNameList gatherQmakePathsFromQtChooser()
-{
-    const QString qtchooser = QStandardPaths::findExecutable(QStringLiteral("qtchooser"));
-    if (qtchooser.isEmpty())
-        return FileNameList();
-
-    QList<QByteArray> versions = runQtChooser(qtchooser, QStringList() << QStringLiteral("-l"));
-    QSet<FileName> foundQMakes;
-    foreach (const QByteArray &version, versions) {
-        FileName possibleQMake = FileName::fromString(
-                    qmakePath(qtchooser, QString::fromLocal8Bit(version)));
-        if (!possibleQMake.isEmpty())
-            foundQMakes << possibleQMake;
-    }
-    return foundQMakes.toList();
-}
-
-static void findSystemQt()
-{
-    FileNameList systemQMakes;
-    FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
-    if (!systemQMakePath.isEmpty())
-        systemQMakes << systemQMakePath;
-
-    systemQMakes.append(gatherQmakePathsFromQtChooser());
-    systemQMakes.removeDuplicates();
-
-    foreach (const FileName &qmakePath, systemQMakes) {
-        BaseQtVersion *version
-                = QtVersionFactory::createQtVersionFromQMakePath(qmakePath, false, QLatin1String("PATH"));
-        if (version) {
-            version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
-            m_versions.insert(version->uniqueId(), version);
-        }
-    }
-}
-
-void QtVersionManager::addVersion(BaseQtVersion *version)
-{
-    QTC_ASSERT(m_writer, return);
-    QTC_ASSERT(version != 0, return);
-    if (m_versions.contains(version->uniqueId()))
-        return;
-
-    int uniqueId = version->uniqueId();
-    m_versions.insert(uniqueId, version);
-
-    emit m_instance->qtVersionsChanged(QList<int>() << uniqueId, QList<int>(), QList<int>());
-    saveQtVersions();
-}
-
-void QtVersionManager::removeVersion(BaseQtVersion *version)
-{
-    QTC_ASSERT(version != 0, return);
-    m_versions.remove(version->uniqueId());
-    emit m_instance->qtVersionsChanged(QList<int>(), QList<int>() << version->uniqueId(), QList<int>());
-    saveQtVersions();
-    delete version;
-}
-
-static void updateDocumentation()
-{
-    QStringList files;
-    foreach (BaseQtVersion *v, m_versions) {
-        const QStringList docPaths = QStringList() << v->documentationPath() + QLatin1Char('/')
-                                                   << v->documentationPath() + QLatin1String("/qch/");
-        foreach (const QString &docPath, docPaths) {
-            const QDir versionHelpDir(docPath);
-            foreach (const QString &helpFile,
-                     versionHelpDir.entryList(QStringList() << QLatin1String("*.qch"), QDir::Files))
-                files << docPath + helpFile;
-        }
-    }
-    Core::HelpManager::registerDocumentation(files);
-}
-
-void QtVersionManager::updateDumpFor(const FileName &qmakeCommand)
-{
-    foreach (BaseQtVersion *v, versions()) {
-        if (v->qmakeCommand() == qmakeCommand)
-            v->recheckDumper();
-    }
-    emit dumpUpdatedFor(qmakeCommand);
-}
-
-int QtVersionManager::getUniqueId()
-{
-    return m_idcount++;
-}
-
-QList<BaseQtVersion *> QtVersionManager::unsortedVersions()
-{
-    QList<BaseQtVersion *> versions;
-    QTC_ASSERT(isLoaded(), return versions);
-    return m_versions.values();
-}
-
-QList<BaseQtVersion *> QtVersionManager::versions()
-{
-    QList<BaseQtVersion *> versions;
-    QTC_ASSERT(isLoaded(), return versions);
-    foreach (BaseQtVersion *version, m_versions)
-        versions << version;
-    Utils::sort(versions, qtVersionNumberCompare);
-    return versions;
-}
-
-QList<BaseQtVersion *> QtVersionManager::validVersions()
-{
-    QList<BaseQtVersion *> results;
-    QTC_ASSERT(isLoaded(), return results);
-    foreach (BaseQtVersion *v, m_versions) {
-        if (v->isValid())
-            results.append(v);
-    }
-    Utils::sort(results, qtVersionNumberCompare);
-    return results;
-}
-
-bool QtVersionManager::isValidId(int id)
-{
-    QTC_ASSERT(isLoaded(), return false);
-    return m_versions.contains(id);
-}
-
-BaseQtVersion *QtVersionManager::version(int id)
-{
-    QTC_ASSERT(isLoaded(), return 0);
-    QMap<int, BaseQtVersion *>::const_iterator it = m_versions.constFind(id);
-    if (it == m_versions.constEnd())
-        return 0;
-    return it.value();
-}
-
-// This function is really simplistic...
-static bool equals(BaseQtVersion *a, BaseQtVersion *b)
-{
-    return a->equals(b);
-}
-
-void QtVersionManager::setNewQtVersions(QList<BaseQtVersion *> newVersions)
-{
-    // We want to preserve the same order as in the settings dialog
-    // so we sort a copy
-    QList<BaseQtVersion *> sortedNewVersions = newVersions;
-    Utils::sort(sortedNewVersions, [](const BaseQtVersion *l, const BaseQtVersion *r) {
-        return l->uniqueId() < r->uniqueId();
-    });
-
-    QList<int> addedVersions;
-    QList<int> removedVersions;
-    QList<int> changedVersions;
-    // So we trying to find the minimal set of changed versions,
-    // iterate over both sorted list
-
-    // newVersions and oldVersions iterator
-    QList<BaseQtVersion *>::const_iterator nit, nend;
-    QMap<int, BaseQtVersion *>::const_iterator oit, oend;
-    nit = sortedNewVersions.constBegin();
-    nend = sortedNewVersions.constEnd();
-    oit = m_versions.constBegin();
-    oend = m_versions.constEnd();
-
-    while (nit != nend && oit != oend) {
-        int nid = (*nit)->uniqueId();
-        int oid = (*oit)->uniqueId();
-        if (nid < oid) {
-            addedVersions.push_back(nid);
-            ++nit;
-        } else if (oid < nid) {
-            removedVersions.push_back(oid);
-            ++oit;
-        } else {
-            if (!equals(*oit, *nit))
-                changedVersions.push_back(oid);
-            ++oit;
-            ++nit;
-        }
-    }
-
-    while (nit != nend) {
-        addedVersions.push_back((*nit)->uniqueId());
-        ++nit;
-    }
-
-    while (oit != oend) {
-        removedVersions.push_back((*oit)->uniqueId());
-        ++oit;
-    }
-
-    qDeleteAll(m_versions);
-    m_versions.clear();
-    foreach (BaseQtVersion *v, sortedNewVersions)
-        m_versions.insert(v->uniqueId(), v);
-
-    if (!changedVersions.isEmpty() || !addedVersions.isEmpty() || !removedVersions.isEmpty())
-        updateDocumentation();
-
-    saveQtVersions();
-
-    if (!changedVersions.isEmpty() || !addedVersions.isEmpty() || !removedVersions.isEmpty())
-        emit m_instance->qtVersionsChanged(addedVersions, removedVersions, changedVersions);
-}
-
-BaseQtVersion *QtVersionManager::qtVersionForQMakeBinary(const FileName &qmakePath)
-{
-    return Utils::findOrDefault(versions(), Utils::equal(&BaseQtVersion::qmakeCommand, qmakePath));
-}
-
-} // namespace QtVersion

=== removed file 'dist/qtcreator/.pc/applied-patches'
--- dist/qtcreator/.pc/applied-patches	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-disable_llvm_rpath.diff
-02_use_x-terminal-emulator.diff
-rpath_nonlinux.diff
-botan_system_lib.diff
-always_autotect_qt_versions
-missing_header.diff
-fix_documentation_path.diff
-skip_failing_unit_tests.diff
-cmake_ubuntuspecificbits.diff
-fix_qt_version_autodetection.diff
-fix_remote_environment.diff

=== removed directory 'dist/qtcreator/.pc/botan_system_lib.diff'
=== removed file 'dist/qtcreator/.pc/botan_system_lib.diff/.timestamp'
=== removed directory 'dist/qtcreator/.pc/botan_system_lib.diff/src'
=== removed directory 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs'
=== removed directory 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh'
=== removed file 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshcryptofacility.cpp'
--- dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshcryptofacility.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshcryptofacility.cpp	1970-01-01 00:00:00 +0000
@@ -1,414 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "sshcryptofacility_p.h"
-
-#include "sshbotanconversions_p.h"
-#include "sshcapabilities_p.h"
-#include "sshexception_p.h"
-#include "sshkeyexchange_p.h"
-#include "sshkeypasswordretriever_p.h"
-#include "sshpacket_p.h"
-
-#include <botan/botan.h>
-
-#include <QDebug>
-#include <QList>
-
-#include <string>
-
-using namespace Botan;
-
-namespace QSsh {
-namespace Internal {
-
-SshAbstractCryptoFacility::SshAbstractCryptoFacility()
-    : m_cipherBlockSize(0), m_macLength(0)
-{
-}
-
-SshAbstractCryptoFacility::~SshAbstractCryptoFacility() {}
-
-void SshAbstractCryptoFacility::clearKeys()
-{
-    m_cipherBlockSize = 0;
-    m_macLength = 0;
-    m_sessionId.clear();
-    m_pipe.reset(0);
-    m_hMac.reset(0);
-}
-
-SshAbstractCryptoFacility::Mode SshAbstractCryptoFacility::getMode(const QByteArray &algoName)
-{
-    if (algoName.endsWith("-ctr"))
-        return CtrMode;
-    if (algoName.endsWith("-cbc"))
-        return CbcMode;
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected cipher \"%1\"")
-                             .arg(QString::fromLatin1(algoName)));
-}
-
-void SshAbstractCryptoFacility::recreateKeys(const SshKeyExchange &kex)
-{
-    checkInvariant();
-
-    if (m_sessionId.isEmpty())
-        m_sessionId = kex.h();
-    Algorithm_Factory &af = global_state().algorithm_factory();
-    const QByteArray &rfcCryptAlgoName = cryptAlgoName(kex);
-    BlockCipher * const cipher
-            = af.prototype_block_cipher(botanCryptAlgoName(rfcCryptAlgoName))->clone();
-
-    m_cipherBlockSize = cipher->block_size();
-    const QByteArray ivData = generateHash(kex, ivChar(), m_cipherBlockSize);
-    const InitializationVector iv(convertByteArray(ivData), m_cipherBlockSize);
-
-    const quint32 keySize = cipher->key_spec().maximum_keylength();
-    const QByteArray cryptKeyData = generateHash(kex, keyChar(), keySize);
-    SymmetricKey cryptKey(convertByteArray(cryptKeyData), keySize);
-    Keyed_Filter * const cipherMode
-            = makeCipherMode(cipher, getMode(rfcCryptAlgoName), iv, cryptKey);
-    m_pipe.reset(new Pipe(cipherMode));
-
-    m_macLength = botanHMacKeyLen(hMacAlgoName(kex));
-    const QByteArray hMacKeyData = generateHash(kex, macChar(), macLength());
-    SymmetricKey hMacKey(convertByteArray(hMacKeyData), macLength());
-    const HashFunction * const hMacProto
-        = af.prototype_hash_function(botanHMacAlgoName(hMacAlgoName(kex)));
-    m_hMac.reset(new HMAC(hMacProto->clone()));
-    m_hMac->set_key(hMacKey);
-}
-
-void SshAbstractCryptoFacility::convert(QByteArray &data, quint32 offset,
-    quint32 dataSize) const
-{
-    Q_ASSERT(offset + dataSize <= static_cast<quint32>(data.size()));
-    checkInvariant();
-
-    // Session id empty => No key exchange has happened yet.
-    if (dataSize == 0 || m_sessionId.isEmpty())
-        return;
-
-    if (dataSize % cipherBlockSize() != 0) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid packet size");
-    }
-    m_pipe->process_msg(reinterpret_cast<const byte *>(data.constData()) + offset,
-        dataSize);
-    quint32 bytesRead = m_pipe->read(reinterpret_cast<byte *>(data.data()) + offset,
-        dataSize, m_pipe->message_count() - 1); // Can't use Pipe::LAST_MESSAGE because of a VC bug.
-    if (bytesRead != dataSize) {
-        throw SshClientException(SshInternalError,
-                QLatin1String("Internal error: Botan::Pipe::read() returned unexpected value"));
-    }
-}
-
-Keyed_Filter *SshAbstractCryptoFacility::makeCtrCipherMode(BlockCipher *cipher,
-        const InitializationVector &iv, const SymmetricKey &key)
-{
-    StreamCipher_Filter * const filter = new StreamCipher_Filter(new CTR_BE(cipher));
-    filter->set_key(key);
-    filter->set_iv(iv);
-    return filter;
-}
-
-QByteArray SshAbstractCryptoFacility::generateMac(const QByteArray &data,
-    quint32 dataSize) const
-{
-    return m_sessionId.isEmpty()
-        ? QByteArray()
-        : convertByteArray(m_hMac->process(reinterpret_cast<const byte *>(data.constData()),
-              dataSize));
-}
-
-QByteArray SshAbstractCryptoFacility::generateHash(const SshKeyExchange &kex,
-    char c, quint32 length)
-{
-    const QByteArray &k = kex.k();
-    const QByteArray &h = kex.h();
-    QByteArray data(k);
-    data.append(h).append(c).append(m_sessionId);
-    SecureVector<byte> key
-        = kex.hash()->process(convertByteArray(data), data.size());
-    while (key.size() < length) {
-        SecureVector<byte> tmpKey;
-        tmpKey += SecureVector<byte>(convertByteArray(k), k.size());
-        tmpKey += SecureVector<byte>(convertByteArray(h), h.size());
-        tmpKey += key;
-        key += kex.hash()->process(tmpKey);
-    }
-    return QByteArray(reinterpret_cast<const char *>(key.begin()), length);
-}
-
-void SshAbstractCryptoFacility::checkInvariant() const
-{
-    Q_ASSERT(m_sessionId.isEmpty() == !m_pipe);
-}
-
-
-const QByteArray SshEncryptionFacility::PrivKeyFileStartLineRsa("-----BEGIN RSA PRIVATE KEY-----");
-const QByteArray SshEncryptionFacility::PrivKeyFileStartLineDsa("-----BEGIN DSA PRIVATE KEY-----");
-const QByteArray SshEncryptionFacility::PrivKeyFileEndLineRsa("-----END RSA PRIVATE KEY-----");
-const QByteArray SshEncryptionFacility::PrivKeyFileEndLineDsa("-----END DSA PRIVATE KEY-----");
-
-QByteArray SshEncryptionFacility::cryptAlgoName(const SshKeyExchange &kex) const
-{
-    return kex.encryptionAlgo();
-}
-
-QByteArray SshEncryptionFacility::hMacAlgoName(const SshKeyExchange &kex) const
-{
-    return kex.hMacAlgoClientToServer();
-}
-
-Keyed_Filter *SshEncryptionFacility::makeCipherMode(BlockCipher *cipher, Mode mode,
-        const InitializationVector &iv, const SymmetricKey &key)
-{
-    switch (mode) {
-    case CbcMode:
-        return new CBC_Encryption(cipher, new Null_Padding, key, iv);
-    case CtrMode:
-        return makeCtrCipherMode(cipher, iv, key);
-    }
-    return 0; // For dumb compilers.
-}
-
-void SshEncryptionFacility::encrypt(QByteArray &data) const
-{
-    convert(data, 0, data.size());
-}
-
-void SshEncryptionFacility::createAuthenticationKey(const QByteArray &privKeyFileContents)
-{
-    if (privKeyFileContents == m_cachedPrivKeyContents)
-        return;
-
-#ifdef CREATOR_SSH_DEBUG
-    qDebug("%s: Key not cached, reading", Q_FUNC_INFO);
-#endif
-    QList<BigInt> pubKeyParams;
-    QList<BigInt> allKeyParams;
-    QString error1;
-    QString error2;
-    if (!createAuthenticationKeyFromPKCS8(privKeyFileContents, pubKeyParams, allKeyParams, error1)
-            && !createAuthenticationKeyFromOpenSSL(privKeyFileContents, pubKeyParams, allKeyParams,
-                error2)) {
-#ifdef CREATOR_SSH_DEBUG
-        qDebug("%s: %s\n\t%s\n", Q_FUNC_INFO, qPrintable(error1), qPrintable(error2));
-#endif
-        throw SshClientException(SshKeyFileError, SSH_TR("Decoding of private key file failed: "
-            "Format not understood."));
-    }
-
-    foreach (const BigInt &b, allKeyParams) {
-        if (b.is_zero()) {
-            throw SshClientException(SshKeyFileError,
-                SSH_TR("Decoding of private key file failed: Invalid zero parameter."));
-        }
-    }
-
-    m_authPubKeyBlob = AbstractSshPacket::encodeString(m_authKeyAlgoName);
-    foreach (const BigInt &b, pubKeyParams)
-        m_authPubKeyBlob += AbstractSshPacket::encodeMpInt(b);
-    m_cachedPrivKeyContents = privKeyFileContents;
-}
-
-bool SshEncryptionFacility::createAuthenticationKeyFromPKCS8(const QByteArray &privKeyFileContents,
-    QList<BigInt> &pubKeyParams, QList<BigInt> &allKeyParams, QString &error)
-{
-    try {
-        Pipe pipe;
-        pipe.process_msg(convertByteArray(privKeyFileContents), privKeyFileContents.size());
-        Private_Key * const key = PKCS8::load_key(pipe, m_rng, SshKeyPasswordRetriever());
-        if (DSA_PrivateKey * const dsaKey = dynamic_cast<DSA_PrivateKey *>(key)) {
-            m_authKeyAlgoName = SshCapabilities::PubKeyDss;
-            m_authKey.reset(dsaKey);
-            pubKeyParams << dsaKey->group_p() << dsaKey->group_q()
-                         << dsaKey->group_g() << dsaKey->get_y();
-            allKeyParams << pubKeyParams << dsaKey->get_x();
-        } else if (RSA_PrivateKey * const rsaKey = dynamic_cast<RSA_PrivateKey *>(key)) {
-            m_authKeyAlgoName = SshCapabilities::PubKeyRsa;
-            m_authKey.reset(rsaKey);
-            pubKeyParams << rsaKey->get_e() << rsaKey->get_n();
-            allKeyParams << pubKeyParams << rsaKey->get_p() << rsaKey->get_q()
-                         << rsaKey->get_d();
-        } else {
-            qWarning("%s: Unexpected code flow, expected success or exception.", Q_FUNC_INFO);
-            return false;
-        }
-    } catch (const Exception &ex) {
-        error = QLatin1String(ex.what());
-        return false;
-    } catch (const Decoding_Error &ex) {
-        error = QLatin1String(ex.what());
-        return false;
-    }
-
-    return true;
-}
-
-bool SshEncryptionFacility::createAuthenticationKeyFromOpenSSL(const QByteArray &privKeyFileContents,
-    QList<BigInt> &pubKeyParams, QList<BigInt> &allKeyParams, QString &error)
-{
-    try {
-        bool syntaxOk = true;
-        QList<QByteArray> lines = privKeyFileContents.split('\n');
-        while (lines.last().isEmpty())
-            lines.removeLast();
-        if (lines.count() < 3) {
-            syntaxOk = false;
-        } else if (lines.first() == PrivKeyFileStartLineRsa) {
-            if (lines.last() != PrivKeyFileEndLineRsa)
-                syntaxOk = false;
-            else
-                m_authKeyAlgoName = SshCapabilities::PubKeyRsa;
-        } else if (lines.first() == PrivKeyFileStartLineDsa) {
-            if (lines.last() != PrivKeyFileEndLineDsa)
-                syntaxOk = false;
-            else
-                m_authKeyAlgoName = SshCapabilities::PubKeyDss;
-        } else {
-            syntaxOk = false;
-        }
-        if (!syntaxOk) {
-            error = SSH_TR("Unexpected format.");
-            return false;
-        }
-
-        QByteArray privateKeyBlob;
-        for (int i = 1; i < lines.size() - 1; ++i)
-            privateKeyBlob += lines.at(i);
-        privateKeyBlob = QByteArray::fromBase64(privateKeyBlob);
-
-        BER_Decoder decoder(convertByteArray(privateKeyBlob), privateKeyBlob.size());
-        BER_Decoder sequence = decoder.start_cons(SEQUENCE);
-        size_t version;
-        sequence.decode (version);
-        if (version != 0) {
-            error = SSH_TR("Key encoding has version %1, expected 0.").arg(version);
-            return false;
-        }
-
-        if (m_authKeyAlgoName == SshCapabilities::PubKeyDss) {
-            BigInt p, q, g, y, x;
-            sequence.decode (p).decode (q).decode (g).decode (y).decode (x);
-            DSA_PrivateKey * const dsaKey = new DSA_PrivateKey(m_rng, DL_Group(p, q, g), x);
-            m_authKey.reset(dsaKey);
-            pubKeyParams << p << q << g << y;
-            allKeyParams << pubKeyParams << x;
-        } else {
-            BigInt p, q, e, d, n;
-            sequence.decode(n).decode(e).decode(d).decode(p).decode(q);
-            RSA_PrivateKey * const rsaKey = new RSA_PrivateKey(m_rng, p, q, e, d, n);
-            m_authKey.reset(rsaKey);
-            pubKeyParams << e << n;
-            allKeyParams << pubKeyParams << p << q << d;
-        }
-
-        sequence.discard_remaining();
-        sequence.verify_end();
-    } catch (const Exception &ex) {
-        error = QLatin1String(ex.what());
-        return false;
-    } catch (const Decoding_Error &ex) {
-        error = QLatin1String(ex.what());
-        return false;
-    }
-    return true;
-}
-
-QByteArray SshEncryptionFacility::authenticationAlgorithmName() const
-{
-    Q_ASSERT(m_authKey);
-    return m_authKeyAlgoName;
-}
-
-QByteArray SshEncryptionFacility::authenticationKeySignature(const QByteArray &data) const
-{
-    Q_ASSERT(m_authKey);
-
-    QScopedPointer<PK_Signer> signer(new PK_Signer(*m_authKey,
-        botanEmsaAlgoName(m_authKeyAlgoName)));
-    QByteArray dataToSign = AbstractSshPacket::encodeString(sessionId()) + data;
-    QByteArray signature
-        = convertByteArray(signer->sign_message(convertByteArray(dataToSign),
-              dataToSign.size(), m_rng));
-    return AbstractSshPacket::encodeString(m_authKeyAlgoName)
-        + AbstractSshPacket::encodeString(signature);
-}
-
-QByteArray SshEncryptionFacility::getRandomNumbers(int count) const
-{
-    QByteArray data;
-    data.resize(count);
-    m_rng.randomize(convertByteArray(data), count);
-    return data;
-}
-
-SshEncryptionFacility::~SshEncryptionFacility() {}
-
-
-QByteArray SshDecryptionFacility::cryptAlgoName(const SshKeyExchange &kex) const
-{
-    return kex.decryptionAlgo();
-}
-
-QByteArray SshDecryptionFacility::hMacAlgoName(const SshKeyExchange &kex) const
-{
-    return kex.hMacAlgoServerToClient();
-}
-
-Keyed_Filter *SshDecryptionFacility::makeCipherMode(BlockCipher *cipher, Mode mode, const InitializationVector &iv,
-    const SymmetricKey &key)
-{
-    switch (mode) {
-    case CbcMode:
-        return new CBC_Decryption(cipher, new Null_Padding, key, iv);
-    case CtrMode:
-        return makeCtrCipherMode(cipher, iv, key);
-    }
-    return 0; // For dumb compilers.
-}
-
-void SshDecryptionFacility::decrypt(QByteArray &data, quint32 offset,
-    quint32 dataSize) const
-{
-    convert(data, offset, dataSize);
-#ifdef CREATOR_SSH_DEBUG
-    qDebug("Decrypted data:");
-    const char * const start = data.constData() + offset;
-    const char * const end = start + dataSize;
-    for (const char *c = start; c < end; ++c)
-        qDebug() << "'" << *c << "' (0x" << (static_cast<int>(*c) & 0xff) << ")";
-#endif
-}
-
-} // namespace Internal
-} // namespace QSsh

=== removed file 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshcryptofacility_p.h'
--- dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshcryptofacility_p.h	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshcryptofacility_p.h	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef SSHCRYPTOFACILITY_P_H
-#define SSHCRYPTOFACILITY_P_H
-
-#include <botan/botan.h>
-
-#include <QByteArray>
-#include <QScopedPointer>
-
-namespace QSsh {
-namespace Internal {
-
-class SshKeyExchange;
-
-class SshAbstractCryptoFacility
-{
-public:
-    virtual ~SshAbstractCryptoFacility();
-
-    void clearKeys();
-    void recreateKeys(const SshKeyExchange &kex);
-    QByteArray generateMac(const QByteArray &data, quint32 dataSize) const;
-    quint32 cipherBlockSize() const { return m_cipherBlockSize; }
-    quint32 macLength() const { return m_macLength; }
-
-protected:
-    enum Mode { CbcMode, CtrMode };
-
-    SshAbstractCryptoFacility();
-    void convert(QByteArray &data, quint32 offset, quint32 dataSize) const;
-    QByteArray sessionId() const { return m_sessionId; }
-    Botan::Keyed_Filter *makeCtrCipherMode(Botan::BlockCipher *cipher,
-        const Botan::InitializationVector &iv, const Botan::SymmetricKey &key);
-
-private:
-    SshAbstractCryptoFacility(const SshAbstractCryptoFacility &);
-    SshAbstractCryptoFacility &operator=(const SshAbstractCryptoFacility &);
-
-    virtual QByteArray cryptAlgoName(const SshKeyExchange &kex) const = 0;
-    virtual QByteArray hMacAlgoName(const SshKeyExchange &kex) const = 0;
-    virtual Botan::Keyed_Filter *makeCipherMode(Botan::BlockCipher *cipher,
-        Mode mode, const Botan::InitializationVector &iv, const Botan::SymmetricKey &key) = 0;
-    virtual char ivChar() const = 0;
-    virtual char keyChar() const = 0;
-    virtual char macChar() const = 0;
-
-    QByteArray generateHash(const SshKeyExchange &kex, char c, quint32 length);
-    void checkInvariant() const;
-    static Mode getMode(const QByteArray &algoName);
-
-    QByteArray m_sessionId;
-    QScopedPointer<Botan::Pipe> m_pipe;
-    QScopedPointer<Botan::HMAC> m_hMac;
-    quint32 m_cipherBlockSize;
-    quint32 m_macLength;
-};
-
-class SshEncryptionFacility : public SshAbstractCryptoFacility
-{
-public:
-    void encrypt(QByteArray &data) const;
-
-    void createAuthenticationKey(const QByteArray &privKeyFileContents);
-    QByteArray authenticationAlgorithmName() const;
-    QByteArray authenticationPublicKey() const { return m_authPubKeyBlob; }
-    QByteArray authenticationKeySignature(const QByteArray &data) const;
-    QByteArray getRandomNumbers(int count) const;
-
-    ~SshEncryptionFacility();
-
-private:
-    virtual QByteArray cryptAlgoName(const SshKeyExchange &kex) const;
-    virtual QByteArray hMacAlgoName(const SshKeyExchange &kex) const;
-    virtual Botan::Keyed_Filter *makeCipherMode(Botan::BlockCipher *cipher,
-        Mode mode, const Botan::InitializationVector &iv, const Botan::SymmetricKey &key);
-    virtual char ivChar() const { return 'A'; }
-    virtual char keyChar() const { return 'C'; }
-    virtual char macChar() const { return 'E'; }
-
-    bool createAuthenticationKeyFromPKCS8(const QByteArray &privKeyFileContents,
-        QList<Botan::BigInt> &pubKeyParams, QList<Botan::BigInt> &allKeyParams, QString &error);
-    bool createAuthenticationKeyFromOpenSSL(const QByteArray &privKeyFileContents,
-        QList<Botan::BigInt> &pubKeyParams, QList<Botan::BigInt> &allKeyParams, QString &error);
-
-    static const QByteArray PrivKeyFileStartLineRsa;
-    static const QByteArray PrivKeyFileStartLineDsa;
-    static const QByteArray PrivKeyFileEndLineRsa;
-    static const QByteArray PrivKeyFileEndLineDsa;
-
-    QByteArray m_authKeyAlgoName;
-    QByteArray m_authPubKeyBlob;
-    QByteArray m_cachedPrivKeyContents;
-    QScopedPointer<Botan::Private_Key> m_authKey;
-    mutable Botan::AutoSeeded_RNG m_rng;
-};
-
-class SshDecryptionFacility : public SshAbstractCryptoFacility
-{
-public:
-    void decrypt(QByteArray &data, quint32 offset, quint32 dataSize) const;
-
-private:
-    virtual QByteArray cryptAlgoName(const SshKeyExchange &kex) const;
-    virtual QByteArray hMacAlgoName(const SshKeyExchange &kex) const;
-    virtual Botan::Keyed_Filter *makeCipherMode(Botan::BlockCipher *cipher,
-        Mode mode, const Botan::InitializationVector &iv, const Botan::SymmetricKey &key);
-    virtual char ivChar() const { return 'B'; }
-    virtual char keyChar() const { return 'D'; }
-    virtual char macChar() const { return 'F'; }
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SSHCRYPTOFACILITY_P_H

=== removed file 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeyexchange.cpp'
--- dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeyexchange.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeyexchange.cpp	1970-01-01 00:00:00 +0000
@@ -1,295 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "sshkeyexchange_p.h"
-
-#include "ssh_global.h"
-#include "sshbotanconversions_p.h"
-#include "sshcapabilities_p.h"
-#include "sshsendfacility_p.h"
-#include "sshexception_p.h"
-#include "sshincomingpacket_p.h"
-
-#include <botan/botan.h>
-
-#ifdef CREATOR_SSH_DEBUG
-#include <iostream>
-#endif
-#include <string>
-
-using namespace Botan;
-
-namespace QSsh {
-namespace Internal {
-
-namespace {
-
-    // For debugging
-    void printNameList(const char *listName, const SshNameList &list)
-    {
-#ifdef CREATOR_SSH_DEBUG
-        qDebug("%s:", listName);
-        foreach (const QByteArray &name, list.names)
-            qDebug("%s", name.constData());
-#else
-        Q_UNUSED(listName);
-        Q_UNUSED(list);
-#endif
-    }
-
-#ifdef CREATOR_SSH_DEBUG
-    void printData(const char *name, const QByteArray &data)
-    {
-        std::cerr << std::hex;
-        qDebug("The client thinks the %s has length %d and is:", name, data.count());
-        for (int i = 0; i < data.count(); ++i)
-            std::cerr << (static_cast<unsigned int>(data.at(i)) & 0xff) << ' ';
-        std::cerr << std::endl;
-    }
-#endif
-
-} // anonymous namespace
-
-SshKeyExchange::SshKeyExchange(const SshConnectionParameters &connParams,
-                               SshSendFacility &sendFacility)
-    : m_connParams(connParams), m_sendFacility(sendFacility)
-{
-}
-
-SshKeyExchange::~SshKeyExchange() {}
-
-void SshKeyExchange::sendKexInitPacket(const QByteArray &serverId)
-{
-    m_serverId = serverId;
-    m_clientKexInitPayload = m_sendFacility.sendKeyExchangeInitPacket();
-}
-
-bool SshKeyExchange::sendDhInitPacket(const SshIncomingPacket &serverKexInit)
-{
-#ifdef CREATOR_SSH_DEBUG
-    qDebug("server requests key exchange");
-#endif
-    serverKexInit.printRawBytes();
-    SshKeyExchangeInit kexInitParams
-            = serverKexInit.extractKeyExchangeInitData();
-
-    printNameList("Key Algorithms", kexInitParams.keyAlgorithms);
-    printNameList("Server Host Key Algorithms", kexInitParams.serverHostKeyAlgorithms);
-    printNameList("Encryption algorithms client to server", kexInitParams.encryptionAlgorithmsClientToServer);
-    printNameList("Encryption algorithms server to client", kexInitParams.encryptionAlgorithmsServerToClient);
-    printNameList("MAC algorithms client to server", kexInitParams.macAlgorithmsClientToServer);
-    printNameList("MAC algorithms server to client", kexInitParams.macAlgorithmsServerToClient);
-    printNameList("Compression algorithms client to server", kexInitParams.compressionAlgorithmsClientToServer);
-    printNameList("Compression algorithms client to server", kexInitParams.compressionAlgorithmsClientToServer);
-    printNameList("Languages client to server", kexInitParams.languagesClientToServer);
-    printNameList("Languages server to client", kexInitParams.languagesServerToClient);
-#ifdef CREATOR_SSH_DEBUG
-    qDebug("First packet follows: %d", kexInitParams.firstKexPacketFollows);
-#endif
-
-    m_kexAlgoName = SshCapabilities::findBestMatch(SshCapabilities::KeyExchangeMethods,
-                                                   kexInitParams.keyAlgorithms.names);
-    m_serverHostKeyAlgo = SshCapabilities::findBestMatch(SshCapabilities::PublicKeyAlgorithms,
-            kexInitParams.serverHostKeyAlgorithms.names);
-    determineHashingAlgorithm(kexInitParams, true);
-    determineHashingAlgorithm(kexInitParams, false);
-
-    m_encryptionAlgo
-        = SshCapabilities::findBestMatch(SshCapabilities::EncryptionAlgorithms,
-              kexInitParams.encryptionAlgorithmsClientToServer.names);
-    m_decryptionAlgo
-        = SshCapabilities::findBestMatch(SshCapabilities::EncryptionAlgorithms,
-              kexInitParams.encryptionAlgorithmsServerToClient.names);
-    SshCapabilities::findBestMatch(SshCapabilities::CompressionAlgorithms,
-        kexInitParams.compressionAlgorithmsClientToServer.names);
-    SshCapabilities::findBestMatch(SshCapabilities::CompressionAlgorithms,
-        kexInitParams.compressionAlgorithmsServerToClient.names);
-
-    AutoSeeded_RNG rng;
-    if (m_kexAlgoName.startsWith(SshCapabilities::EcdhKexNamePrefix)) {
-        m_ecdhKey.reset(new ECDH_PrivateKey(rng, EC_Group(botanKeyExchangeAlgoName(m_kexAlgoName))));
-        m_sendFacility.sendKeyEcdhInitPacket(convertByteArray(m_ecdhKey->public_value()));
-    } else {
-        m_dhKey.reset(new DH_PrivateKey(rng, DL_Group(botanKeyExchangeAlgoName(m_kexAlgoName))));
-        m_sendFacility.sendKeyDhInitPacket(m_dhKey->get_y());
-    }
-
-    m_serverKexInitPayload = serverKexInit.payLoad();
-    return kexInitParams.firstKexPacketFollows;
-}
-
-void SshKeyExchange::sendNewKeysPacket(const SshIncomingPacket &dhReply,
-    const QByteArray &clientId)
-{
-
-    const SshKeyExchangeReply &reply
-        = dhReply.extractKeyExchangeReply(m_kexAlgoName, m_serverHostKeyAlgo);
-    if (m_dhKey && (reply.f <= 0 || reply.f >= m_dhKey->group_p())) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-            "Server sent invalid f.");
-    }
-
-    QByteArray concatenatedData = AbstractSshPacket::encodeString(clientId);
-    concatenatedData += AbstractSshPacket::encodeString(m_serverId);
-    concatenatedData += AbstractSshPacket::encodeString(m_clientKexInitPayload);
-    concatenatedData += AbstractSshPacket::encodeString(m_serverKexInitPayload);
-    concatenatedData += reply.k_s;
-    SecureVector<byte> encodedK;
-    if (m_dhKey) {
-        concatenatedData += AbstractSshPacket::encodeMpInt(m_dhKey->get_y());
-        concatenatedData += AbstractSshPacket::encodeMpInt(reply.f);
-        DH_KA_Operation dhOp(*m_dhKey);
-        SecureVector<byte> encodedF = BigInt::encode(reply.f);
-        encodedK = dhOp.agree(encodedF, encodedF.size());
-        m_dhKey.reset(nullptr);
-    } else {
-        Q_ASSERT(m_ecdhKey);
-        concatenatedData // Q_C.
-                += AbstractSshPacket::encodeString(convertByteArray(m_ecdhKey->public_value()));
-        concatenatedData += AbstractSshPacket::encodeString(reply.q_s);
-        ECDH_KA_Operation ecdhOp(*m_ecdhKey);
-        encodedK = ecdhOp.agree(convertByteArray(reply.q_s), reply.q_s.count());
-        m_ecdhKey.reset(nullptr);
-    }
-
-    const BigInt k = BigInt::decode(encodedK);
-    m_k = AbstractSshPacket::encodeMpInt(k); // Roundtrip, as Botan encodes BigInts somewhat differently.
-    concatenatedData += m_k;
-
-    m_hash.reset(get_hash(botanHMacAlgoName(hashAlgoForKexAlgo())));
-    const SecureVector<byte> &hashResult = m_hash->process(convertByteArray(concatenatedData),
-                                                           concatenatedData.size());
-    m_h = convertByteArray(hashResult);
-
-#ifdef CREATOR_SSH_DEBUG
-    printData("Client Id", AbstractSshPacket::encodeString(clientId));
-    printData("Server Id", AbstractSshPacket::encodeString(m_serverId));
-    printData("Client Payload", AbstractSshPacket::encodeString(m_clientKexInitPayload));
-    printData("Server payload", AbstractSshPacket::encodeString(m_serverKexInitPayload));
-    printData("K_S", reply.k_s);
-    printData("y", AbstractSshPacket::encodeMpInt(m_dhKey->get_y()));
-    printData("f", AbstractSshPacket::encodeMpInt(reply.f));
-    printData("K", m_k);
-    printData("Concatenated data", concatenatedData);
-    printData("H", m_h);
-#endif // CREATOR_SSH_DEBUG
-
-    QScopedPointer<Public_Key> sigKey;
-    if (m_serverHostKeyAlgo == SshCapabilities::PubKeyDss) {
-        const DL_Group group(reply.hostKeyParameters.at(0), reply.hostKeyParameters.at(1),
-            reply.hostKeyParameters.at(2));
-        DSA_PublicKey * const dsaKey
-            = new DSA_PublicKey(group, reply.hostKeyParameters.at(3));
-        sigKey.reset(dsaKey);
-    } else if (m_serverHostKeyAlgo == SshCapabilities::PubKeyRsa) {
-        RSA_PublicKey * const rsaKey
-            = new RSA_PublicKey(reply.hostKeyParameters.at(1), reply.hostKeyParameters.at(0));
-        sigKey.reset(rsaKey);
-    } else {
-        QSSH_ASSERT_AND_RETURN(m_serverHostKeyAlgo == SshCapabilities::PubKeyEcdsa256);
-        const EC_Group domain("secp256r1");
-        const PointGFp point = OS2ECP(convertByteArray(reply.q), reply.q.count(),
-                                      domain.get_curve());
-        ECDSA_PublicKey * const ecdsaKey = new ECDSA_PublicKey(domain, point);
-        sigKey.reset(ecdsaKey);
-    }
-
-    const byte * const botanH = convertByteArray(m_h);
-    const Botan::byte * const botanSig = convertByteArray(reply.signatureBlob);
-    PK_Verifier verifier(*sigKey, botanEmsaAlgoName(m_serverHostKeyAlgo));
-    if (!verifier.verify_message(botanH, m_h.size(), botanSig, reply.signatureBlob.size())) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-            "Invalid signature in key exchange reply packet.");
-    }
-
-    checkHostKey(reply.k_s);
-
-    m_sendFacility.sendNewKeysPacket();
-}
-
-QByteArray SshKeyExchange::hashAlgoForKexAlgo() const
-{
-    if (m_kexAlgoName == SshCapabilities::EcdhNistp256)
-        return SshCapabilities::HMacSha256;
-    if (m_kexAlgoName == SshCapabilities::EcdhNistp384)
-        return SshCapabilities::HMacSha384;
-    if (m_kexAlgoName == SshCapabilities::EcdhNistp521)
-        return SshCapabilities::HMacSha512;
-    return SshCapabilities::HMacSha1;
-}
-
-void SshKeyExchange::determineHashingAlgorithm(const SshKeyExchangeInit &kexInit,
-                                               bool serverToClient)
-{
-    QByteArray * const algo = serverToClient ? &m_s2cHMacAlgo : &m_c2sHMacAlgo;
-    const QList<QByteArray> &serverCapabilities = serverToClient
-            ? kexInit.macAlgorithmsServerToClient.names
-            : kexInit.macAlgorithmsClientToServer.names;
-    *algo = SshCapabilities::findBestMatch(SshCapabilities::MacAlgorithms, serverCapabilities);
-}
-
-void SshKeyExchange::checkHostKey(const QByteArray &hostKey)
-{
-    if (m_connParams.hostKeyCheckingMode == SshHostKeyCheckingNone) {
-        if (m_connParams.hostKeyDatabase)
-            m_connParams.hostKeyDatabase->insertHostKey(m_connParams.host, hostKey);
-        return;
-    }
-
-    if (!m_connParams.hostKeyDatabase) {
-        throw SshClientException(SshInternalError,
-                                 SSH_TR("Host key database must exist "
-                                        "if host key checking is enabled."));
-    }
-
-    switch (m_connParams.hostKeyDatabase->matchHostKey(m_connParams.host, hostKey)) {
-    case SshHostKeyDatabase::KeyLookupMatch:
-        return; // Nothing to do.
-    case SshHostKeyDatabase::KeyLookupMismatch:
-        if (m_connParams.hostKeyCheckingMode != SshHostKeyCheckingAllowMismatch)
-            throwHostKeyException();
-        break;
-    case SshHostKeyDatabase::KeyLookupNoMatch:
-        if (m_connParams.hostKeyCheckingMode == SshHostKeyCheckingStrict)
-            throwHostKeyException();
-        break;
-    }
-    m_connParams.hostKeyDatabase->insertHostKey(m_connParams.host, hostKey);
-}
-
-void SshKeyExchange::throwHostKeyException()
-{
-    throw SshServerException(SSH_DISCONNECT_HOST_KEY_NOT_VERIFIABLE, "Host key changed",
-                             SSH_TR("Host key of machine \"%1\" has changed.")
-                             .arg(m_connParams.host));
-}
-
-} // namespace Internal
-} // namespace QSsh

=== removed file 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeygenerator.cpp'
--- dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeygenerator.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeygenerator.cpp	1970-01-01 00:00:00 +0000
@@ -1,198 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "sshkeygenerator.h"
-
-#include "sshbotanconversions_p.h"
-#include "sshcapabilities_p.h"
-#include "sshinit_p.h"
-#include "sshpacket_p.h"
-
-#include <botan/botan.h>
-
-#include <QDateTime>
-#include <QInputDialog>
-
-#include <string>
-
-namespace QSsh {
-
-using namespace Botan;
-using namespace Internal;
-
-SshKeyGenerator::SshKeyGenerator() : m_type(Rsa)
-{
-    initSsh();
-}
-
-bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int keySize,
-    EncryptionMode encryptionMode)
-{
-    m_type = type;
-    m_encryptionMode = encryptionMode;
-
-    try {
-        AutoSeeded_RNG rng;
-        KeyPtr key;
-        if (m_type == Rsa)
-            key = KeyPtr(new RSA_PrivateKey(rng, keySize));
-        else
-            key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::DSA_Kosherizer, keySize)));
-        switch (format) {
-        case Pkcs8:
-            generatePkcs8KeyStrings(key, rng);
-            break;
-        case OpenSsl:
-            generateOpenSslKeyStrings(key);
-            break;
-        case Mixed:
-        default:
-            generatePkcs8KeyString(key, true, rng);
-            generateOpenSslPublicKeyString(key);
-        }
-        return true;
-    } catch (const Exception &e) {
-        m_error = tr("Error generating key: %1").arg(QString::fromLatin1(e.what()));
-        return false;
-    }
-}
-
-void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key, RandomNumberGenerator &rng)
-{
-    generatePkcs8KeyString(key, false, rng);
-    generatePkcs8KeyString(key, true, rng);
-}
-
-void SshKeyGenerator::generatePkcs8KeyString(const KeyPtr &key, bool privateKey,
-    RandomNumberGenerator &rng)
-{
-    Pipe pipe;
-    pipe.start_msg();
-    QByteArray *keyData;
-    if (privateKey) {
-        QString password;
-        if (m_encryptionMode == DoOfferEncryption)
-            password = getPassword();
-        if (!password.isEmpty())
-            pipe.write(PKCS8::PEM_encode(*key, rng, password.toLocal8Bit().data()));
-        else
-            pipe.write(PKCS8::PEM_encode(*key));
-        keyData = &m_privateKey;
-    } else {
-        pipe.write(X509::PEM_encode(*key));
-        keyData = &m_publicKey;
-    }
-    pipe.end_msg();
-    keyData->resize(pipe.remaining(pipe.message_count() - 1));
-    pipe.read(convertByteArray(*keyData), keyData->size(),
-        pipe.message_count() - 1);
-}
-
-void SshKeyGenerator::generateOpenSslKeyStrings(const KeyPtr &key)
-{
-    generateOpenSslPublicKeyString(key);
-    generateOpenSslPrivateKeyString(key);
-}
-
-void SshKeyGenerator::generateOpenSslPublicKeyString(const KeyPtr &key)
-{
-    QList<BigInt> params;
-    QByteArray keyId;
-    if (m_type == Rsa) {
-        const QSharedPointer<RSA_PrivateKey> rsaKey = key.dynamicCast<RSA_PrivateKey>();
-        params << rsaKey->get_e() << rsaKey->get_n();
-        keyId = SshCapabilities::PubKeyRsa;
-    } else {
-        const QSharedPointer<DSA_PrivateKey> dsaKey = key.dynamicCast<DSA_PrivateKey>();
-        params << dsaKey->group_p() << dsaKey->group_q() << dsaKey->group_g() << dsaKey->get_y();
-        keyId = SshCapabilities::PubKeyDss;
-    }
-
-    QByteArray publicKeyBlob = AbstractSshPacket::encodeString(keyId);
-    foreach (const BigInt &b, params)
-        publicKeyBlob += AbstractSshPacket::encodeMpInt(b);
-    publicKeyBlob = publicKeyBlob.toBase64();
-    const QByteArray id = "QtCreator/"
-        + QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8();
-    m_publicKey = keyId + ' ' + publicKeyBlob + ' ' + id;
-}
-
-void SshKeyGenerator::generateOpenSslPrivateKeyString(const KeyPtr &key)
-{
-    QList<BigInt> params;
-    QByteArray keyId;
-    const char *label;
-    if (m_type == Rsa) {
-        const QSharedPointer<RSA_PrivateKey> rsaKey
-            = key.dynamicCast<RSA_PrivateKey>();
-        params << rsaKey->get_n() << rsaKey->get_e() << rsaKey->get_d() << rsaKey->get_p()
-            << rsaKey->get_q();
-        const BigInt dmp1 = rsaKey->get_d() % (rsaKey->get_p() - 1);
-        const BigInt dmq1 = rsaKey->get_d() % (rsaKey->get_q() - 1);
-        const BigInt iqmp = inverse_mod(rsaKey->get_q(), rsaKey->get_p());
-        params << dmp1 << dmq1 << iqmp;
-        keyId = SshCapabilities::PubKeyRsa;
-        label = "RSA PRIVATE KEY";
-    } else {
-        const QSharedPointer<DSA_PrivateKey> dsaKey = key.dynamicCast<DSA_PrivateKey>();
-        params << dsaKey->group_p() << dsaKey->group_q() << dsaKey->group_g() << dsaKey->get_y()
-            << dsaKey->get_x();
-        keyId = SshCapabilities::PubKeyDss;
-        label = "DSA PRIVATE KEY";
-    }
-
-    DER_Encoder encoder;
-    encoder.start_cons(SEQUENCE).encode(size_t(0));
-    foreach (const BigInt &b, params)
-        encoder.encode(b);
-    encoder.end_cons();
-    m_privateKey = QByteArray(PEM_Code::encode (encoder.get_contents(), label).c_str());
-}
-
-QString SshKeyGenerator::getPassword() const
-{
-    QInputDialog d;
-    d.setInputMode(QInputDialog::TextInput);
-    d.setTextEchoMode(QLineEdit::Password);
-    d.setWindowTitle(tr("Password for Private Key"));
-    d.setLabelText(tr("It is recommended that you secure your private key\n"
-        "with a password, which you can enter below."));
-    d.setOkButtonText(tr("Encrypt Key File"));
-    d.setCancelButtonText(tr("Do Not Encrypt Key File"));
-    int result = QDialog::Accepted;
-    QString password;
-    while (result == QDialog::Accepted && password.isEmpty()) {
-        result = d.exec();
-        password = d.textValue();
-    }
-    return result == QDialog::Accepted ? password : QString();
-}
-
-} // namespace QSsh

=== removed file 'dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeypasswordretriever_p.h'
--- dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeypasswordretriever_p.h	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/botan_system_lib.diff/src/libs/ssh/sshkeypasswordretriever_p.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-#ifndef KEYPASSWORDRETRIEVER_H
-#define KEYPASSWORDRETRIEVER_H
-
-#include <botan/botan.h>
-
-#include <string>
-
-namespace QSsh {
-namespace Internal {
-
-class SshKeyPasswordRetriever : public Botan::User_Interface
-{
-public:
-    std::string get_passphrase(const std::string &what, const std::string &source,
-        UI_Result &result) const;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // KEYPASSWORDRETRIEVER_H

=== removed directory 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff'
=== removed file 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/.timestamp'
=== removed directory 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src'
=== removed directory 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins'
=== removed directory 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager'
=== removed file 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/cmakeproject.cpp'
--- dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/cmakeproject.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/cmakeproject.cpp	1970-01-01 00:00:00 +0000
@@ -1,783 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "cmakeproject.h"
-
-#include "cmakebuildconfiguration.h"
-#include "cmakeprojectconstants.h"
-#include "cmakeprojectnodes.h"
-#include "cmakerunconfiguration.h"
-#include "makestep.h"
-#include "cmakeopenprojectwizard.h"
-#include "cmakecbpparser.h"
-#include "cmakefile.h"
-#include "cmakeprojectmanager.h"
-
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/headerpath.h>
-#include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/buildmanager.h>
-#include <projectexplorer/buildtargetinfo.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/kitmanager.h>
-#include <projectexplorer/toolchain.h>
-
-#include <projectexplorer/deployconfiguration.h>
-#include <projectexplorer/deploymentdata.h>
-#include <qtsupport/customexecutablerunconfiguration.h>
-#include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
-#include <qtsupport/uicodemodelsupport.h>
-#include <cpptools/cppmodelmanager.h>
-#include <extensionsystem/pluginmanager.h>
-#include <utils/algorithm.h>
-#include <utils/qtcassert.h>
-#include <utils/stringutils.h>
-#include <utils/hostosinfo.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/infobar.h>
-#include <coreplugin/editormanager/editormanager.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QFileSystemWatcher>
-
-using namespace CMakeProjectManager;
-using namespace CMakeProjectManager::Internal;
-using namespace ProjectExplorer;
-using namespace Utils;
-
-// QtCreator CMake Generator wishlist:
-// Which make targets we need to build to get all executables
-// What is the make we need to call
-// What is the actual compiler executable
-// DEFINES
-
-// Open Questions
-// Who sets up the environment for cl.exe ? INCLUDEPATH and so on
-
-/*!
-  \class CMakeProject
-*/
-CMakeProject::CMakeProject(CMakeManager *manager, const FileName &fileName)
-    : m_manager(manager),
-      m_activeTarget(0),
-      m_fileName(fileName),
-      m_rootNode(new CMakeProjectNode(fileName)),
-      m_watcher(new QFileSystemWatcher(this))
-{
-    setId(Constants::CMAKEPROJECT_ID);
-    setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT));
-    setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
-
-    m_projectName = fileName.parentDir().fileName();
-
-    m_file = new CMakeFile(this, fileName);
-
-    connect(this, SIGNAL(buildTargetsChanged()),
-            this, SLOT(updateRunConfigurations()));
-
-    connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
-}
-
-CMakeProject::~CMakeProject()
-{
-    m_codeModelFuture.cancel();
-    delete m_rootNode;
-}
-
-void CMakeProject::fileChanged(const QString &fileName)
-{
-    Q_UNUSED(fileName)
-
-    parseCMakeLists();
-}
-
-void CMakeProject::changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
-{
-    if (!bc)
-        return;
-
-    CMakeBuildConfiguration *cmakebc = static_cast<CMakeBuildConfiguration *>(bc);
-
-    // Pop up a dialog asking the user to rerun cmake
-    QString cbpFile = CMakeManager::findCbpFile(QDir(bc->buildDirectory().toString()));
-    QFileInfo cbpFileFi(cbpFile);
-    CMakeOpenProjectWizard::Mode mode = CMakeOpenProjectWizard::Nothing;
-    if (!cbpFileFi.exists()) {
-        mode = CMakeOpenProjectWizard::NeedToCreate;
-    } else {
-        foreach (const FileName &file, m_watchedFiles) {
-            if (file.toFileInfo().lastModified() > cbpFileFi.lastModified()) {
-                mode = CMakeOpenProjectWizard::NeedToUpdate;
-                break;
-            }
-        }
-    }
-
-    if (mode != CMakeOpenProjectWizard::Nothing) {
-        CMakeBuildInfo info(cmakebc);
-        CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info);
-        if (copw.exec() == QDialog::Accepted)
-            cmakebc->setUseNinja(copw.useNinja()); // NeedToCreate can change the Ninja setting
-    }
-
-    // reparse
-    parseCMakeLists();
-}
-
-void CMakeProject::activeTargetWasChanged(Target *target)
-{
-    if (m_activeTarget) {
-        disconnect(m_activeTarget, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
-                   this, SLOT(changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
-    }
-
-    m_activeTarget = target;
-
-    if (!m_activeTarget)
-        return;
-
-    connect(m_activeTarget, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
-            this, SLOT(changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
-
-    changeActiveBuildConfiguration(m_activeTarget->activeBuildConfiguration());
-}
-
-void CMakeProject::changeBuildDirectory(CMakeBuildConfiguration *bc, const QString &newBuildDirectory)
-{
-    bc->setBuildDirectory(FileName::fromString(newBuildDirectory));
-    parseCMakeLists();
-}
-
-QStringList CMakeProject::getCXXFlagsFor(const CMakeBuildTarget &buildTarget, QByteArray *cachedBuildNinja)
-{
-    QString makeCommand = QDir::fromNativeSeparators(buildTarget.makeCommand);
-    int startIndex = makeCommand.indexOf(QLatin1Char('\"'));
-    int endIndex = makeCommand.indexOf(QLatin1Char('\"'), startIndex + 1);
-    if (startIndex != -1 && endIndex != -1) {
-        startIndex += 1;
-        QString makefile = makeCommand.mid(startIndex, endIndex - startIndex);
-        int slashIndex = makefile.lastIndexOf(QLatin1Char('/'));
-        makefile.truncate(slashIndex);
-        makefile.append(QLatin1String("/CMakeFiles/") + buildTarget.title + QLatin1String(".dir/flags.make"));
-        QFile file(makefile);
-        if (file.exists()) {
-            file.open(QIODevice::ReadOnly | QIODevice::Text);
-            QTextStream stream(&file);
-            while (!stream.atEnd()) {
-                QString line = stream.readLine().trimmed();
-                if (line.startsWith(QLatin1String("CXX_FLAGS ="))) {
-                    // Skip past =
-                    return line.mid(11).trimmed().split(QLatin1Char(' '), QString::SkipEmptyParts);
-                }
-            }
-        }
-    }
-
-    // Attempt to find build.ninja file and obtain FLAGS (CXX_FLAGS) from there if no suitable flags.make were
-    // found
-    // Get "all" target's working directory
-    if (!buildTargets().empty()) {
-        if (cachedBuildNinja->isNull()) {
-            QString buildNinjaFile = QDir::fromNativeSeparators(buildTargets().at(0).workingDirectory);
-            buildNinjaFile += QLatin1String("/build.ninja");
-            QFile buildNinja(buildNinjaFile);
-            if (buildNinja.exists()) {
-                buildNinja.open(QIODevice::ReadOnly | QIODevice::Text);
-                *cachedBuildNinja = buildNinja.readAll();
-                buildNinja.close();
-            } else {
-                *cachedBuildNinja = QByteArray();
-            }
-        }
-
-        if (cachedBuildNinja->isEmpty())
-            return QStringList();
-
-        QTextStream stream(cachedBuildNinja);
-        bool targetFound = false;
-        bool cxxFound = false;
-        QString targetSearchPattern = QString::fromLatin1("target %1").arg(buildTarget.title);
-
-        while (!stream.atEnd()) {
-            // 1. Look for a block that refers to the current target
-            // 2. Look for a build rule which invokes CXX_COMPILER
-            // 3. Return the FLAGS definition
-            QString line = stream.readLine().trimmed();
-            if (line.startsWith(QLatin1String("#"))) {
-                if (!line.startsWith(QLatin1String("# Object build statements for"))) continue;
-                targetFound = line.endsWith(targetSearchPattern);
-            } else if (targetFound && line.startsWith(QLatin1String("build"))) {
-                cxxFound = line.indexOf(QLatin1String("CXX_COMPILER")) != -1;
-            } else if (cxxFound && line.startsWith(QLatin1String("FLAGS ="))) {
-                // Skip past =
-                return line.mid(7).trimmed().split(QLatin1Char(' '), QString::SkipEmptyParts);
-            }
-        }
-
-    }
-    return QStringList();
-}
-
-bool CMakeProject::parseCMakeLists()
-{
-    if (!activeTarget() ||
-        !activeTarget()->activeBuildConfiguration()) {
-        return false;
-    }
-
-    CMakeBuildConfiguration *activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
-    foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments())
-        if (isProjectFile(document->filePath()))
-            document->infoBar()->removeInfo("CMakeEditor.RunCMake");
-
-    // Find cbp file
-    QString cbpFile = CMakeManager::findCbpFile(activeBC->buildDirectory().toString());
-
-    if (cbpFile.isEmpty()) {
-        emit buildTargetsChanged();
-        return false;
-    }
-
-    Kit *k = activeTarget()->kit();
-
-    // setFolderName
-    m_rootNode->setDisplayName(QFileInfo(cbpFile).completeBaseName());
-    CMakeCbpParser cbpparser;
-    // Parsing
-    //qDebug()<<"Parsing file "<<cbpFile;
-    if (!cbpparser.parseCbpFile(k,cbpFile, projectDirectory().toString())) {
-        // TODO report error
-        emit buildTargetsChanged();
-        return false;
-    }
-
-    foreach (const QString &file, m_watcher->files())
-        if (file != cbpFile)
-            m_watcher->removePath(file);
-
-    // how can we ensure that it is completely written?
-    m_watcher->addPath(cbpFile);
-
-    m_projectName = cbpparser.projectName();
-    m_rootNode->setDisplayName(cbpparser.projectName());
-
-    //qDebug()<<"Building Tree";
-    QList<ProjectExplorer::FileNode *> fileList = cbpparser.fileList();
-    QSet<FileName> projectFiles;
-    if (cbpparser.hasCMakeFiles()) {
-        fileList.append(cbpparser.cmakeFileList());
-        foreach (const ProjectExplorer::FileNode *node, cbpparser.cmakeFileList())
-            projectFiles.insert(node->path());
-    } else {
-        // Manually add the CMakeLists.txt file
-        FileName cmakeListTxt = projectDirectory().appendPath(QLatin1String("CMakeLists.txt"));
-        bool generated = false;
-        fileList.append(new ProjectExplorer::FileNode(cmakeListTxt, ProjectExplorer::ProjectFileType, generated));
-        projectFiles.insert(cmakeListTxt);
-    }
-
-    m_watchedFiles = projectFiles;
-
-    m_files.clear();
-    foreach (ProjectExplorer::FileNode *fn, fileList)
-        m_files.append(fn->path().toString());
-    m_files.sort();
-
-    buildTree(m_rootNode, fileList);
-
-    //qDebug()<<"Adding Targets";
-    m_buildTargets = cbpparser.buildTargets();
-//        qDebug()<<"Printing targets";
-//        foreach (CMakeBuildTarget ct, m_buildTargets) {
-//            qDebug()<<ct.title<<" with executable:"<<ct.executable;
-//            qDebug()<<"WD:"<<ct.workingDirectory;
-//            qDebug()<<ct.makeCommand<<ct.makeCleanCommand;
-//            qDebug()<<"";
-//        }
-
-    updateApplicationAndDeploymentTargets();
-
-    createUiCodeModelSupport();
-
-    ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
-    if (!tc) {
-        emit buildTargetsChanged();
-        emit fileListChanged();
-        return true;
-    }
-
-    CppTools::CppModelManager *modelmanager = CppTools::CppModelManager::instance();
-    CppTools::ProjectInfo pinfo(this);
-    CppTools::ProjectPartBuilder ppBuilder(pinfo);
-
-    CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
-    if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) {
-        if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
-            activeQtVersion = CppTools::ProjectPart::Qt4;
-        else
-            activeQtVersion = CppTools::ProjectPart::Qt5;
-    }
-
-    ppBuilder.setQtVersion(activeQtVersion);
-
-    QByteArray cachedBuildNinja;
-    foreach (const CMakeBuildTarget &cbt, m_buildTargets) {
-        // This explicitly adds -I. to the include paths
-        QStringList includePaths = cbt.includeFiles;
-        includePaths += projectDirectory().toString();
-        ppBuilder.setIncludePaths(includePaths);
-        QStringList cxxflags = getCXXFlagsFor(cbt, &cachedBuildNinja);
-        ppBuilder.setCFlags(cxxflags);
-        ppBuilder.setCxxFlags(cxxflags);
-        ppBuilder.setDefines(cbt.defines);
-        ppBuilder.setDisplayName(cbt.title);
-
-        const QList<Core::Id> languages = ppBuilder.createProjectPartsForFiles(cbt.files);
-        foreach (Core::Id language, languages)
-            setProjectLanguage(language, true);
-    }
-
-    m_codeModelFuture.cancel();
-    pinfo.finish();
-    m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
-
-    emit displayNameChanged();
-    emit buildTargetsChanged();
-    emit fileListChanged();
-
-    emit activeBC->emitBuildTypeChanged();
-
-    return true;
-}
-
-bool CMakeProject::isProjectFile(const FileName &fileName)
-{
-    return m_watchedFiles.contains(fileName);
-}
-
-QList<CMakeBuildTarget> CMakeProject::buildTargets() const
-{
-    return m_buildTargets;
-}
-
-QStringList CMakeProject::buildTargetTitles(bool runnable) const
-{
-    QStringList results;
-    foreach (const CMakeBuildTarget &ct, m_buildTargets) {
-        if (runnable && (ct.executable.isEmpty() || ct.targetType != ExecutableType))
-            continue;
-        results << ct.title;
-    }
-    return results;
-}
-
-bool CMakeProject::hasBuildTarget(const QString &title) const
-{
-    foreach (const CMakeBuildTarget &ct, m_buildTargets) {
-        if (ct.title == title)
-            return true;
-    }
-    return false;
-}
-
-void CMakeProject::gatherFileNodes(ProjectExplorer::FolderNode *parent, QList<ProjectExplorer::FileNode *> &list)
-{
-    foreach (ProjectExplorer::FolderNode *folder, parent->subFolderNodes())
-        gatherFileNodes(folder, list);
-    foreach (ProjectExplorer::FileNode *file, parent->fileNodes())
-        list.append(file);
-}
-
-bool sortNodesByPath(Node *a, Node *b)
-{
-    return a->path() < b->path();
-}
-
-void CMakeProject::buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::FileNode *> newList)
-{
-    // Gather old list
-    QList<ProjectExplorer::FileNode *> oldList;
-    gatherFileNodes(rootNode, oldList);
-    Utils::sort(oldList, sortNodesByPath);
-    Utils::sort(newList, sortNodesByPath);
-
-    QList<ProjectExplorer::FileNode *> added;
-    QList<ProjectExplorer::FileNode *> deleted;
-
-    ProjectExplorer::compareSortedLists(oldList, newList, deleted, added, sortNodesByPath);
-
-    qDeleteAll(ProjectExplorer::subtractSortedList(newList, added, sortNodesByPath));
-
-    // add added nodes
-    foreach (ProjectExplorer::FileNode *fn, added) {
-//        qDebug()<<"added"<<fn->path();
-        // Get relative path to rootNode
-        QString parentDir = fn->path().toFileInfo().absolutePath();
-        ProjectExplorer::FolderNode *folder = findOrCreateFolder(rootNode, parentDir);
-        folder->addFileNodes(QList<ProjectExplorer::FileNode *>()<< fn);
-    }
-
-    // remove old file nodes and check whether folder nodes can be removed
-    foreach (ProjectExplorer::FileNode *fn, deleted) {
-        ProjectExplorer::FolderNode *parent = fn->parentFolderNode();
-//        qDebug()<<"removed"<<fn->path();
-        parent->removeFileNodes(QList<ProjectExplorer::FileNode *>() << fn);
-        // Check for empty parent
-        while (parent->subFolderNodes().isEmpty() && parent->fileNodes().isEmpty()) {
-            ProjectExplorer::FolderNode *grandparent = parent->parentFolderNode();
-            grandparent->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent);
-            parent = grandparent;
-            if (parent == rootNode)
-                break;
-        }
-    }
-}
-
-ProjectExplorer::FolderNode *CMakeProject::findOrCreateFolder(CMakeProjectNode *rootNode, QString directory)
-{
-    FileName path = rootNode->path().parentDir();
-    QDir rootParentDir(path.toString());
-    QString relativePath = rootParentDir.relativeFilePath(directory);
-    if (relativePath == QLatin1String("."))
-        relativePath.clear();
-    QStringList parts = relativePath.split(QLatin1Char('/'), QString::SkipEmptyParts);
-    ProjectExplorer::FolderNode *parent = rootNode;
-    foreach (const QString &part, parts) {
-        path.appendPath(part);
-        // Find folder in subFolders
-        bool found = false;
-        foreach (ProjectExplorer::FolderNode *folder, parent->subFolderNodes()) {
-            if (folder->path() == path) {
-                // yeah found something :)
-                parent = folder;
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            // No FolderNode yet, so create it
-            ProjectExplorer::FolderNode *tmp = new ProjectExplorer::FolderNode(path);
-            tmp->setDisplayName(part);
-            parent->addFolderNodes(QList<ProjectExplorer::FolderNode *>() << tmp);
-            parent = tmp;
-        }
-    }
-    return parent;
-}
-
-QString CMakeProject::displayName() const
-{
-    return m_projectName;
-}
-
-Core::IDocument *CMakeProject::document() const
-{
-    return m_file;
-}
-
-IProjectManager *CMakeProject::projectManager() const
-{
-    return m_manager;
-}
-
-ProjectExplorer::ProjectNode *CMakeProject::rootProjectNode() const
-{
-    return m_rootNode;
-}
-
-
-QStringList CMakeProject::files(FilesMode fileMode) const
-{
-    Q_UNUSED(fileMode)
-    return m_files;
-}
-
-bool CMakeProject::fromMap(const QVariantMap &map)
-{
-    if (!Project::fromMap(map))
-        return false;
-
-    bool hasUserFile = activeTarget();
-    if (!hasUserFile) {
-        CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, projectDirectory().toString(), Environment::systemEnvironment());
-        if (copw.exec() != QDialog::Accepted)
-            return false;
-        Kit *k = copw.kit();
-        Target *t = new Target(this, k);
-        CMakeBuildConfiguration *bc(new CMakeBuildConfiguration(t));
-        bc->setDefaultDisplayName(QLatin1String("all"));
-        bc->setUseNinja(copw.useNinja());
-        bc->setBuildDirectory(FileName::fromString(copw.buildDirectory()));
-        ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
-        ProjectExplorer::BuildStepList *cleanSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
-
-        // Now create a standard build configuration
-        buildSteps->insertStep(0, new MakeStep(buildSteps));
-
-        MakeStep *cleanMakeStep = new MakeStep(cleanSteps);
-        cleanSteps->insertStep(0, cleanMakeStep);
-        cleanMakeStep->setAdditionalArguments(QLatin1String("clean"));
-        cleanMakeStep->setClean(true);
-
-        t->addBuildConfiguration(bc);
-
-        t->updateDefaultDeployConfigurations();
-
-        addTarget(t);
-    } else {
-        // We have a user file, but we could still be missing the cbp file
-        // or simply run createXml with the saved settings
-        CMakeBuildConfiguration *activeBC = qobject_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
-        if (!activeBC)
-            return false;
-        QString cbpFile = CMakeManager::findCbpFile(QDir(activeBC->buildDirectory().toString()));
-        QFileInfo cbpFileFi(cbpFile);
-
-        CMakeOpenProjectWizard::Mode mode = CMakeOpenProjectWizard::Nothing;
-        if (!cbpFileFi.exists())
-            mode = CMakeOpenProjectWizard::NeedToCreate;
-        else if (cbpFileFi.lastModified() < m_fileName.toFileInfo().lastModified())
-            mode = CMakeOpenProjectWizard::NeedToUpdate;
-
-        if (mode != CMakeOpenProjectWizard::Nothing) {
-            CMakeBuildInfo info(activeBC);
-            CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), m_manager, mode, &info);
-            if (copw.exec() != QDialog::Accepted)
-                return false;
-            else
-                activeBC->setUseNinja(copw.useNinja());
-        }
-    }
-
-    parseCMakeLists();
-
-    m_activeTarget = activeTarget();
-    if (m_activeTarget)
-        connect(m_activeTarget, SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
-                this, SLOT(changeActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
-
-    connect(this, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
-            this, SLOT(activeTargetWasChanged(ProjectExplorer::Target*)));
-
-    return true;
-}
-
-bool CMakeProject::setupTarget(Target *t)
-{
-    t->updateDefaultBuildConfigurations();
-    if (t->buildConfigurations().isEmpty())
-        return false;
-    t->updateDefaultDeployConfigurations();
-
-    return true;
-}
-
-CMakeBuildTarget CMakeProject::buildTargetForTitle(const QString &title)
-{
-    foreach (const CMakeBuildTarget &ct, m_buildTargets)
-        if (ct.title == title)
-            return ct;
-    return CMakeBuildTarget();
-}
-
-QString CMakeProject::uiHeaderFile(const QString &uiFile)
-{
-    QFileInfo fi(uiFile);
-    FileName project = projectDirectory();
-    FileName baseDirectory = FileName::fromString(fi.absolutePath());
-
-    while (baseDirectory.isChildOf(project)) {
-        FileName cmakeListsTxt = baseDirectory;
-        cmakeListsTxt.appendPath(QLatin1String("CMakeLists.txt"));
-        if (cmakeListsTxt.exists())
-            break;
-        QDir dir(baseDirectory.toString());
-        dir.cdUp();
-        baseDirectory = FileName::fromString(dir.absolutePath());
-    }
-
-    QDir srcDirRoot = QDir(project.toString());
-    QString relativePath = srcDirRoot.relativeFilePath(baseDirectory.toString());
-    QDir buildDir = QDir(activeTarget()->activeBuildConfiguration()->buildDirectory().toString());
-    QString uiHeaderFilePath = buildDir.absoluteFilePath(relativePath);
-    uiHeaderFilePath += QLatin1String("/ui_");
-    uiHeaderFilePath += fi.completeBaseName();
-    uiHeaderFilePath += QLatin1String(".h");
-
-    return QDir::cleanPath(uiHeaderFilePath);
-}
-
-void CMakeProject::updateRunConfigurations()
-{
-    foreach (Target *t, targets())
-        updateRunConfigurations(t);
-}
-
-// TODO Compare with updateDefaultRunConfigurations();
-void CMakeProject::updateRunConfigurations(Target *t)
-{
-    // *Update* runconfigurations:
-    QMultiMap<QString, CMakeRunConfiguration*> existingRunConfigurations;
-    QList<ProjectExplorer::RunConfiguration *> toRemove;
-    foreach (ProjectExplorer::RunConfiguration *rc, t->runConfigurations()) {
-        if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc))
-            existingRunConfigurations.insert(cmakeRC->title(), cmakeRC);
-        QtSupport::CustomExecutableRunConfiguration *ceRC =
-                qobject_cast<QtSupport::CustomExecutableRunConfiguration *>(rc);
-        if (ceRC && !ceRC->isConfigured())
-            toRemove << rc;
-    }
-
-    foreach (const CMakeBuildTarget &ct, buildTargets()) {
-        if (ct.targetType != ExecutableType)
-            continue;
-        if (ct.executable.isEmpty())
-            continue;
-        QList<CMakeRunConfiguration *> list = existingRunConfigurations.values(ct.title);
-        if (!list.isEmpty()) {
-            // Already exists, so override the settings...
-            foreach (CMakeRunConfiguration *rc, list) {
-                rc->setExecutable(ct.executable);
-                rc->setBaseWorkingDirectory(ct.workingDirectory);
-                rc->setEnabled(true);
-            }
-            existingRunConfigurations.remove(ct.title);
-        } else {
-            // Does not exist yet
-            Core::Id id = CMakeRunConfigurationFactory::idFromBuildTarget(ct.title);
-            CMakeRunConfiguration *rc = new CMakeRunConfiguration(t, id, ct.executable,
-                                                                  ct.workingDirectory, ct.title);
-            t->addRunConfiguration(rc);
-        }
-    }
-    QMultiMap<QString, CMakeRunConfiguration *>::const_iterator it =
-            existingRunConfigurations.constBegin();
-    for ( ; it != existingRunConfigurations.constEnd(); ++it) {
-        CMakeRunConfiguration *rc = it.value();
-        // The executables for those runconfigurations aren't build by the current buildconfiguration
-        // We just set a disable flag and show that in the display name
-        rc->setEnabled(false);
-        // removeRunConfiguration(rc);
-    }
-
-    foreach (ProjectExplorer::RunConfiguration *rc, toRemove)
-        t->removeRunConfiguration(rc);
-
-    if (t->runConfigurations().isEmpty()) {
-        // Oh no, no run configuration,
-        // create a custom executable run configuration
-        t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
-    }
-}
-
-void CMakeProject::updateApplicationAndDeploymentTargets()
-{
-    Target *t = activeTarget();
-
-    QFile deploymentFile;
-    QTextStream deploymentStream;
-    QString deploymentPrefix;
-
-    QDir sourceDir(t->project()->projectDirectory().toString());
-    QDir buildDir(t->activeBuildConfiguration()->buildDirectory().toString());
-
-    deploymentFile.setFileName(sourceDir.filePath(QLatin1String("QtCreatorDeployment.txt")));
-    // If we don't have a global QtCreatorDeployment.txt check for one created by the active build configuration
-    if (!deploymentFile.exists())
-        deploymentFile.setFileName(buildDir.filePath(QLatin1String("QtCreatorDeployment.txt")));
-    if (deploymentFile.open(QFile::ReadOnly | QFile::Text)) {
-        deploymentStream.setDevice(&deploymentFile);
-        deploymentPrefix = deploymentStream.readLine();
-        if (!deploymentPrefix.endsWith(QLatin1Char('/')))
-            deploymentPrefix.append(QLatin1Char('/'));
-    }
-
-    BuildTargetInfoList appTargetList;
-    DeploymentData deploymentData;
-
-    foreach (const CMakeBuildTarget &ct, m_buildTargets) {
-        if (ct.executable.isEmpty())
-            continue;
-
-        if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType)
-            deploymentData.addFile(ct.executable, deploymentPrefix + buildDir.relativeFilePath(QFileInfo(ct.executable).dir().path()), DeployableFile::TypeExecutable);
-        if (ct.targetType == ExecutableType) {
-            // TODO: Put a path to corresponding .cbp file into projectFilePath?
-            appTargetList.list << BuildTargetInfo(ct.title,
-                                                  FileName::fromString(ct.executable),
-                                                  FileName::fromString(ct.executable));
-        }
-    }
-
-    QString absoluteSourcePath = sourceDir.absolutePath();
-    if (!absoluteSourcePath.endsWith(QLatin1Char('/')))
-        absoluteSourcePath.append(QLatin1Char('/'));
-    if (deploymentStream.device()) {
-        while (!deploymentStream.atEnd()) {
-            QString line = deploymentStream.readLine();
-            if (!line.contains(QLatin1Char(':')))
-                continue;
-            QStringList file = line.split(QLatin1Char(':'));
-            deploymentData.addFile(absoluteSourcePath + file.at(0), deploymentPrefix + file.at(1));
-        }
-    }
-
-    t->setApplicationTargets(appTargetList);
-    t->setDeploymentData(deploymentData);
-}
-
-void CMakeProject::createUiCodeModelSupport()
-{
-    QHash<QString, QString> uiFileHash;
-
-    // Find all ui files
-    foreach (const QString &uiFile, m_files) {
-        if (uiFile.endsWith(QLatin1String(".ui")))
-            uiFileHash.insert(uiFile, uiHeaderFile(uiFile));
-    }
-
-    QtSupport::UiCodeModelManager::update(this, uiFileHash);
-}
-
-void CMakeBuildTarget::clear()
-{
-    executable.clear();
-    makeCommand.clear();
-    makeCleanCommand.clear();
-    workingDirectory.clear();
-    sourceDirectory.clear();
-    title.clear();
-    targetType = ExecutableType;
-    includeFiles.clear();
-    compilerOptions.clear();
-    defines.clear();
-}

=== removed file 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp'
--- dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "cmakeprojectmanager.h"
-#include "cmakeopenprojectwizard.h"
-#include "cmakeprojectconstants.h"
-#include "cmakeproject.h"
-#include "cmakesettingspage.h"
-#include "cmaketoolmanager.h"
-
-#include <coreplugin/icore.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <projectexplorer/buildmanager.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/projecttree.h>
-#include <projectexplorer/session.h>
-
-#include <utils/synchronousprocess.h>
-
-#include <QAction>
-#include <QDateTime>
-
-using namespace CMakeProjectManager::Internal;
-
-CMakeManager::CMakeManager()
-{
-    Core::ActionContainer *mbuild =
-            Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
-    Core::ActionContainer *mproject =
-            Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_PROJECTCONTEXT);
-    Core::ActionContainer *msubproject =
-            Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_SUBPROJECTCONTEXT);
-
-    const Core::Context projectContext(CMakeProjectManager::Constants::PROJECTCONTEXT);
-    const Core::Context globalcontext(Core::Constants::C_GLOBAL);
-
-    m_runCMakeAction = new QAction(QIcon(), tr("Run CMake"), this);
-    Core::Command *command = Core::ActionManager::registerAction(m_runCMakeAction,
-                                                                 Constants::RUNCMAKE, globalcontext);
-    command->setAttribute(Core::Command::CA_Hide);
-    mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY);
-    connect(m_runCMakeAction, &QAction::triggered, [this]() {
-        runCMake(ProjectExplorer::SessionManager::startupProject());
-    });
-
-    m_runCMakeActionContextMenu = new QAction(QIcon(), tr("Run CMake"), this);
-    command = Core::ActionManager::registerAction(m_runCMakeActionContextMenu,
-                                                  Constants::RUNCMAKECONTEXTMENU, projectContext);
-    command->setAttribute(Core::Command::CA_Hide);
-    mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
-    msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
-    connect(m_runCMakeActionContextMenu, &QAction::triggered, [this]() {
-        runCMake(ProjectExplorer::ProjectTree::currentProject());
-    });
-
-    connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged,
-            this, &CMakeManager::updateRunCmakeAction);
-    connect(ProjectExplorer::BuildManager::instance(), &ProjectExplorer::BuildManager::buildStateChanged,
-            this, &CMakeManager::updateRunCmakeAction);
-
-}
-
-void CMakeManager::updateRunCmakeAction()
-{
-    auto project = qobject_cast<CMakeProject *>(ProjectExplorer::SessionManager::startupProject());
-    m_runCMakeAction->setVisible(project && !ProjectExplorer::BuildManager::isBuilding(project));
-}
-
-void CMakeManager::runCMake(ProjectExplorer::Project *project)
-{
-    if (!project)
-        return;
-    CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
-    if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
-        return;
-
-    if (!ProjectExplorer::ProjectExplorerPlugin::saveModifiedFiles())
-        return;
-
-    CMakeBuildConfiguration *bc
-            = static_cast<CMakeBuildConfiguration *>(cmakeProject->activeTarget()->activeBuildConfiguration());
-
-    CMakeBuildInfo info(bc);
-
-    CMakeOpenProjectWizard copw(Core::ICore::mainWindow(), this, CMakeOpenProjectWizard::WantToUpdate, &info);
-    if (copw.exec() == QDialog::Accepted)
-        cmakeProject->parseCMakeLists();
-}
-
-ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName, QString *errorString)
-{
-    Utils::FileName file = Utils::FileName::fromString(fileName);
-    if (!file.toFileInfo().isFile()) {
-        if (errorString)
-            *errorString = tr("Failed opening project \"%1\": Project is not a file")
-                .arg(file.toUserOutput());
-        return 0;
-    }
-
-    return new CMakeProject(this, file);
-}
-
-QString CMakeManager::mimeType() const
-{
-    return QLatin1String(Constants::CMAKEPROJECTMIMETYPE);
-}
-
-bool CMakeManager::preferNinja() const
-{
-    return CMakeToolManager::preferNinja();
-}
-
-// need to refactor this out
-// we probably want the process instead of this function
-// cmakeproject then could even run the cmake process in the background, adding the files afterwards
-// sounds like a plan
-void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &executable, const QString &arguments,
-                                 const QString &sourceDirectory, const QDir &buildDirectory,
-                                 const Utils::Environment &env, const QString &generator)
-{
-    QString buildDirectoryPath = buildDirectory.absolutePath();
-    buildDirectory.mkpath(buildDirectoryPath);
-    proc->setWorkingDirectory(buildDirectoryPath);
-    proc->setEnvironment(env);
-
-    const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ?
-                QString(QLatin1Char('.')) : sourceDirectory;
-    QString args;
-    Utils::QtcProcess::addArg(&args, srcdir);
-    Utils::QtcProcess::addArgs(&args, arguments);
-    Utils::QtcProcess::addArg(&args, generator);
-    proc->setCommand(executable, args);
-    proc->start();
-}
-
-QString CMakeManager::findCbpFile(const QDir &directory)
-{
-    // Find the cbp file
-    //   the cbp file is named like the project() command in the CMakeList.txt file
-    //   so this function below could find the wrong cbp file, if the user changes the project()
-    //   2name
-    QDateTime t;
-    QString file;
-    foreach (const QString &cbpFile , directory.entryList()) {
-        if (cbpFile.endsWith(QLatin1String(".cbp"))) {
-            QFileInfo fi(directory.path() + QLatin1Char('/') + cbpFile);
-            if (t.isNull() || fi.lastModified() > t) {
-                file = directory.path() + QLatin1Char('/') + cbpFile;
-                t = fi.lastModified();
-            }
-        }
-    }
-    return file;
-}

=== removed file 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/generatorinfo.cpp'
--- dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/generatorinfo.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/cmakeprojectmanager/generatorinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "generatorinfo.h"
-
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/toolchain.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/kitinformation.h>
-
-#include <baremetal/baremetalconstants.h>
-#include <remotelinux/remotelinux_constants.h>
-#include <qnx/qnxconstants.h>
-
-namespace CMakeProjectManager {
-namespace Internal {
-
-GeneratorInfo::GeneratorInfo()
-    : m_kit(0), m_isNinja(false)
-{}
-
-GeneratorInfo::GeneratorInfo(ProjectExplorer::Kit *kit, bool ninja)
-    : m_kit(kit), m_isNinja(ninja)
-{}
-
-ProjectExplorer::Kit *GeneratorInfo::kit() const
-{
-    return m_kit;
-}
-
-bool GeneratorInfo::isNinja() const {
-    return m_isNinja;
-}
-
-QByteArray GeneratorInfo::generator() const
-{
-    if (!m_kit)
-        return QByteArray();
-    ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit);
-    ProjectExplorer::Abi targetAbi = tc->targetAbi();
-    if (m_isNinja) {
-        return "Ninja";
-    } else if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
-        if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) {
-            return "NMake Makefiles";
-        } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
-            if (Utils::HostOsInfo::isWindowsHost())
-                return "MinGW Makefiles";
-            else
-                return "Unix Makefiles";
-        }
-    }
-    return "Unix Makefiles";
-}
-
-QByteArray GeneratorInfo::generatorArgument() const
-{
-    QByteArray tmp = generator();
-    if (tmp.isEmpty())
-        return tmp;
-    return QByteArray("-GCodeBlocks - ") + tmp;
-}
-
-QString GeneratorInfo::displayName() const
-{
-    if (!m_kit)
-        return QString();
-    if (m_isNinja)
-        return tr("Ninja (%1)").arg(m_kit->displayName());
-    ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit);
-    ProjectExplorer::Abi targetAbi = tc->targetAbi();
-    if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
-        if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) {
-            return tr("NMake Generator (%1)").arg(m_kit->displayName());
-        } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
-            if (Utils::HostOsInfo::isWindowsHost())
-                return tr("MinGW Generator (%1)").arg(m_kit->displayName());
-            else
-                return tr("Unix Generator (%1)").arg(m_kit->displayName());
-        }
-    } else {
-        // Non windows
-        return tr("Unix Generator (%1)").arg(m_kit->displayName());
-    }
-    return QString();
-}
-
-QList<GeneratorInfo> GeneratorInfo::generatorInfosFor(ProjectExplorer::Kit *k, Ninja n, bool preferNinja, bool hasCodeBlocks)
-{
-    QList<GeneratorInfo> results;
-    ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
-    if (!tc)
-        return results;
-    Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k);
-    if (deviceType !=  ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE
-            && deviceType != BareMetal::Constants::BareMetalOsType
-            && deviceType != RemoteLinux::Constants::GenericLinuxOsType
-            && deviceType != Qnx::Constants::QNX_QNX_OS_TYPE)
-        return results;
-    ProjectExplorer::Abi targetAbi = tc->targetAbi();
-    if (n != ForceNinja) {
-        if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
-            if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor
-                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor
-                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor
-                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor
-                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor
-                    || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) {
-                if (hasCodeBlocks)
-                    results << GeneratorInfo(k);
-            } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
-                results << GeneratorInfo(k);
-            }
-        } else {
-            // Non windows
-            results << GeneratorInfo(k);
-        }
-    }
-    if (n != NoNinja) {
-        if (preferNinja)
-            results.prepend(GeneratorInfo(k, true));
-        else
-            results.append(GeneratorInfo(k, true));
-    }
-    return results;
-}
-
-} // namespace Internal
-} // namespace CMakeProjectManager

=== removed directory 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/qmakeprojectmanager'
=== removed file 'dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/qmakeprojectmanager/qmakenodes.cpp'
--- dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/qmakeprojectmanager/qmakenodes.cpp	2016-06-09 08:47:42 +0000
+++ dist/qtcreator/.pc/cmake_ubuntuspecificbits.diff/src/plugins/qmakeprojectmanager/qmakenodes.cpp	1970-01-01 00:00:00 +0000
@@ -1,2527 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "qmakenodes.h"
-#include "qmakeproject.h"
-#include "qmakeprojectmanager.h"
-#include "qmakeprojectmanagerconstants.h"
-#include "qmakebuildconfiguration.h"
-#include "qmakerunconfigurationfactory.h"
-
-#include <projectexplorer/nodesvisitor.h>
-#include <projectexplorer/projectexplorer.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/fileiconprovider.h>
-#include <coreplugin/documentmanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/iversioncontrol.h>
-#include <coreplugin/vcsmanager.h>
-#include <coreplugin/dialogs/readonlyfilesdialog.h>
-
-#include <projectexplorer/buildmanager.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/target.h>
-#include <projectexplorer/projecttree.h>
-#include <qtsupport/profilereader.h>
-#include <qtsupport/qtkitinformation.h>
-#include <qtsupport/uicodemodelsupport.h>
-
-#include <resourceeditor/resourcenode.h>
-
-#include <cpptools/cppmodelmanager.h>
-#include <cpptools/cpptoolsconstants.h>
-
-#include <utils/algorithm.h>
-#include <utils/fileutils.h>
-#include <utils/hostosinfo.h>
-#include <utils/qtcprocess.h>
-#include <utils/mimetypes/mimedatabase.h>
-#include <utils/stringutils.h>
-#include <utils/theme/theme.h>
-#include <proparser/prowriter.h>
-#include <proparser/qmakevfs.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QXmlStreamReader>
-
-#include <QMessageBox>
-#include <utils/QtConcurrentTools>
-
-using namespace Core;
-using namespace ProjectExplorer;
-using namespace Utils;
-
-// Static cached data in struct QmakeNodeStaticData providing information and icons
-// for file types and the project. Do some magic via qAddPostRoutine()
-// to make sure the icons do not outlive QApplication, triggering warnings on X11.
-
-struct FileTypeDataStorage {
-    FileType type;
-    const char *typeName;
-    const char *icon;
-    Theme::ImageFile themeImage;
-};
-
-static const FileTypeDataStorage fileTypeDataStorage[] = {
-    { HeaderType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Headers"),
-      ":/qmakeprojectmanager/images/headers.png", Theme::ProjectExplorerHeader },
-    { SourceType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Sources"),
-      ":/qmakeprojectmanager/images/sources.png", Theme::ProjectExplorerSource },
-    { FormType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Forms"),
-      ":/qtsupport/images/forms.png", Theme::ProjectExplorerForm },
-    { ResourceType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Resources"),
-      ":/qtsupport/images/qt_qrc.png", Theme::ProjectExplorerResource },
-    { QMLType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "QML"),
-      ":/qtsupport/images/qml.png", Theme::ProjectExplorerQML },
-    { UnknownFileType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Other files"),
-      ":/qmakeprojectmanager/images/unknown.png", Theme::ProjectExplorerOtherFiles }
-};
-
-class SortByPath
-{
-public:
-    bool operator()(Node *a, Node *b)
-    { return operator()(a->path(), b->path()); }
-    bool operator()(Node *a, const FileName &b)
-    { return operator()(a->path(), b); }
-    bool operator()(const FileName &a, Node *b)
-    { return operator()(a, b->path()); }
-    // Compare as strings to correctly detect case-only file rename
-    bool operator()(const FileName &a, const FileName &b)
-    { return a.toString() < b.toString(); }
-};
-
-class QmakeNodeStaticData {
-public:
-    class FileTypeData {
-    public:
-        FileTypeData(FileType t = UnknownFileType,
-                     const QString &tN = QString(),
-                     const QIcon &i = QIcon()) :
-        type(t), typeName(tN), icon(i) { }
-
-        FileType type;
-        QString typeName;
-        QIcon icon;
-    };
-
-    QmakeNodeStaticData();
-
-    QVector<FileTypeData> fileTypeData;
-    QIcon projectIcon;
-};
-
-static void clearQmakeNodeStaticData();
-
-QmakeNodeStaticData::QmakeNodeStaticData()
-{
-    // File type data
-    const unsigned count = sizeof(fileTypeDataStorage)/sizeof(FileTypeDataStorage);
-    fileTypeData.reserve(count);
-
-    // Overlay the SP_DirIcon with the custom icons
-    const QSize desiredSize = QSize(16, 16);
-
-    for (unsigned i = 0 ; i < count; ++i) {
-        QIcon overlayIcon;
-        const QString iconFile = creatorTheme()->imageFile(fileTypeDataStorage[i].themeImage,
-                                                           QString::fromLatin1(fileTypeDataStorage[i].icon));
-        overlayIcon = QIcon(iconFile);
-        const QPixmap folderPixmap =
-                Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon,
-                                                    overlayIcon, desiredSize);
-        QIcon folderIcon;
-        folderIcon.addPixmap(folderPixmap);
-        const QString desc = QCoreApplication::translate("QmakeProjectManager::QmakePriFileNode", fileTypeDataStorage[i].typeName);
-        fileTypeData.push_back(QmakeNodeStaticData::FileTypeData(fileTypeDataStorage[i].type,
-                                                               desc, folderIcon));
-    }
-    // Project icon
-    const QString fileName = creatorTheme()->imageFile(Theme::ProjectFileIcon,
-                                                       QLatin1String(":/qtsupport/images/qt_project.png"));
-    const QIcon projectBaseIcon(fileName);
-    const QPixmap projectPixmap = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon,
-                                                                      projectBaseIcon,
-                                                                      desiredSize);
-    projectIcon.addPixmap(projectPixmap);
-
-    qAddPostRoutine(clearQmakeNodeStaticData);
-}
-
-Q_GLOBAL_STATIC(QmakeNodeStaticData, qmakeNodeStaticData)
-
-static void clearQmakeNodeStaticData()
-{
-    qmakeNodeStaticData()->fileTypeData.clear();
-    qmakeNodeStaticData()->projectIcon = QIcon();
-}
-
-enum { debug = 0 };
-
-using namespace QmakeProjectManager;
-using namespace QmakeProjectManager::Internal;
-
-namespace QmakeProjectManager {
-namespace Internal {
-class EvalInput
-{
-public:
-    QString projectDir;
-    FileName projectFilePath;
-    QString buildDirectory;
-    QtSupport::ProFileReader *readerExact;
-    QtSupport::ProFileReader *readerCumulative;
-    ProFileGlobals *qmakeGlobals;
-    QMakeVfs *qmakeVfs;
-    bool isQt5;
-};
-
-class PriFileEvalResult
-{
-public:
-    QStringList folders;
-    QSet<FileName> recursiveEnumerateFiles;
-    QMap<FileType, QSet<FileName> > foundFiles;
-};
-
-class EvalResult
-{
-public:
-    enum EvalResultState { EvalAbort, EvalFail, EvalPartial, EvalOk };
-    EvalResultState state;
-    QmakeProjectType projectType;
-
-    QStringList subProjectsNotToDeploy;
-    QHash<FileName, ProFile*> includeFilesExact;
-    FileNameList newProjectFilesExact;
-    QSet<FileName> exactSubdirs;
-    ProFile *fileForCurrentProjectExact; // probably only used in parser thread
-    QHash<FileName, ProFile*> includeFilesCumlative;
-    FileNameList newProjectFilesCumlative;
-    ProFile *fileForCurrentProjectCumlative; // probably only used in parser thread
-    TargetInformation targetInformation;
-    InstallsList installsList;
-    QHash<QmakeVariable, QStringList> newVarValues;
-    bool isDeployable;
-    QHash<FileName, PriFileEvalResult> priFileResults;
-    QStringList errors;
-};
-}
-}
-
-QmakePriFile::QmakePriFile(QmakeProjectManager::QmakePriFileNode *qmakePriFile)
-    : IDocument(0), m_priFile(qmakePriFile)
-{
-    setId("Qmake.PriFile");
-    setMimeType(QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE));
-    setFilePath(m_priFile->path());
-}
-
-bool QmakePriFile::save(QString *errorString, const QString &fileName, bool autoSave)
-{
-    Q_UNUSED(errorString);
-    Q_UNUSED(fileName);
-    Q_UNUSED(autoSave);
-    return false;
-}
-
-QString QmakePriFile::defaultPath() const
-{
-    return QString();
-}
-
-QString QmakePriFile::suggestedFileName() const
-{
-    return QString();
-}
-
-bool QmakePriFile::isModified() const
-{
-    return false;
-}
-
-bool QmakePriFile::isSaveAsAllowed() const
-{
-    return false;
-}
-
-Core::IDocument::ReloadBehavior QmakePriFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
-{
-    Q_UNUSED(state)
-    Q_UNUSED(type)
-    return BehaviorSilent;
-}
-
-bool QmakePriFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
-{
-    Q_UNUSED(errorString)
-    Q_UNUSED(flag)
-    if (type == TypePermissions)
-        return true;
-    m_priFile->scheduleUpdate();
-    return true;
-}
-
-/*!
-  \class QmakePriFileNode
-  Implements abstract ProjectNode class
-  */
-
-namespace QmakeProjectManager {
-
-QmakePriFileNode::QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmakeProFileNode,
-                                   const FileName &filePath)
-        : ProjectNode(filePath),
-          m_project(project),
-          m_qmakeProFileNode(qmakeProFileNode),
-          m_projectFilePath(filePath),
-          m_projectDir(filePath.toFileInfo().absolutePath())
-{
-    Q_ASSERT(project);
-    m_qmakePriFile = new QmakePriFile(this);
-    Core::DocumentManager::addDocument(m_qmakePriFile);
-
-    setDisplayName(filePath.toFileInfo().completeBaseName());
-    setIcon(qmakeNodeStaticData()->projectIcon);
-}
-
-QmakePriFileNode::~QmakePriFileNode()
-{
-    watchFolders(QSet<QString>());
-    delete m_qmakePriFile;
-}
-
-void QmakePriFileNode::scheduleUpdate()
-{
-    QtSupport::ProFileCacheManager::instance()->discardFile(m_projectFilePath.toString());
-    m_qmakeProFileNode->scheduleUpdate(QmakeProFileNode::ParseLater);
-}
-
-namespace Internal {
-struct InternalNode
-{
-    QList<InternalNode *> virtualfolders;
-    QMap<QString, InternalNode *> subnodes;
-    FileNameList files;
-    FileType type = UnknownFileType;
-    int priority = 0;
-    QString displayName;
-    QString typeName;
-    QString fullPath;
-    QIcon icon;
-
-    ~InternalNode()
-    {
-        qDeleteAll(virtualfolders);
-        qDeleteAll(subnodes);
-    }
-
-    // Creates: a tree structure from a list of absolute file paths.
-    // Empty directories are compressed into a single entry with a longer path.
-    // * project
-    //    * /absolute/path
-    //       * file1
-    //    * relative
-    //       * path1
-    //          * file1
-    //          * file2
-    //       * path2
-    //          * file1
-    // The function first creates a tree that looks like the directory structure, i.e.
-    //    * /
-    //       * absolute
-    //          * path
-    // ...
-    // and afterwards calls compress() which merges directory nodes with single children, i.e. to
-    //    * /absolute/path
-    void create(const QString &projectDir, const QSet<FileName> &newFilePaths, FileType type)
-    {
-        static const QChar separator = QLatin1Char('/');
-        const FileName projectDirFileName = FileName::fromString(projectDir);
-        foreach (const FileName &file, newFilePaths) {
-            FileName fileWithoutPrefix;
-            bool isRelative;
-            if (file.isChildOf(projectDirFileName)) {
-                isRelative = true;
-                fileWithoutPrefix = file.relativeChildPath(projectDirFileName);
-            } else {
-                isRelative = false;
-                fileWithoutPrefix = file;
-            }
-            QStringList parts = fileWithoutPrefix.toString().split(separator, QString::SkipEmptyParts);
-            if (!HostOsInfo::isWindowsHost() && !isRelative && parts.count() > 0)
-                parts[0].prepend(separator);
-            QStringListIterator it(parts);
-            InternalNode *currentNode = this;
-            QString path = (isRelative ? (projectDirFileName.toString() + QLatin1Char('/')) : QString());
-            while (it.hasNext()) {
-                const QString &key = it.next();
-                if (it.hasNext()) { // key is directory
-                    path += key;
-                    if (!currentNode->subnodes.contains(path)) {
-                        InternalNode *val = new InternalNode;
-                        val->type = type;
-                        val->fullPath = path;
-                        val->displayName = key;
-                        currentNode->subnodes.insert(path, val);
-                        currentNode = val;
-                    } else {
-                        currentNode = currentNode->subnodes.value(path);
-                    }
-                    path += separator;
-                } else { // key is filename
-                    currentNode->files.append(file);
-                }
-            }
-        }
-        this->compress();
-    }
-
-    // Removes folder nodes with only a single sub folder in it
-    void compress()
-    {
-        QMap<QString, InternalNode*> newSubnodes;
-        QMapIterator<QString, InternalNode*> i(subnodes);
-        while (i.hasNext()) {
-            i.next();
-            i.value()->compress();
-            if (i.value()->files.isEmpty() && i.value()->subnodes.size() == 1) {
-                // replace i.value() by i.value()->subnodes.begin()
-                QString key = i.value()->subnodes.begin().key();
-                InternalNode *keep = i.value()->subnodes.value(key);
-                keep->displayName = i.value()->displayName + QLatin1Char('/') + keep->displayName;
-                newSubnodes.insert(key, keep);
-                i.value()->subnodes.clear();
-                delete i.value();
-            } else {
-                newSubnodes.insert(i.key(), i.value());
-            }
-        }
-        subnodes = newSubnodes;
-    }
-
-    FolderNode *createFolderNode(InternalNode *node)
-    {
-        FolderNode *newNode = 0;
-        if (node->typeName.isEmpty()) {
-            newNode = new FolderNode(FileName::fromString(node->fullPath));
-        } else {
-            newNode = new ProVirtualFolderNode(FileName::fromString(node->fullPath),
-                                               node->priority, node->typeName);
-        }
-
-        newNode->setDisplayName(node->displayName);
-        if (!node->icon.isNull())
-            newNode->setIcon(node->icon);
-        return newNode;
-    }
-
-    // Makes the projectNode's subtree below the given folder match this internal node's subtree
-    void updateSubFolders(FolderNode *folder)
-    {
-        if (type == ResourceType)
-            updateResourceFiles(folder);
-        else
-            updateFiles(folder, type);
-
-        // updateFolders
-        QMultiMap<QString, FolderNode *> existingFolderNodes;
-        foreach (FolderNode *node, folder->subFolderNodes())
-            if (node->nodeType() != ProjectNodeType && !dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node))
-                existingFolderNodes.insert(node->path().toString(), node);
-
-        QList<FolderNode *> foldersToRemove;
-        QList<FolderNode *> foldersToAdd;
-        typedef QPair<InternalNode *, FolderNode *> NodePair;
-        QList<NodePair> nodesToUpdate;
-
-        // Check virtual
-        {
-            QList<InternalNode *>::const_iterator it = virtualfolders.constBegin();
-            QList<InternalNode *>::const_iterator end = virtualfolders.constEnd();
-            for ( ; it != end; ++it) {
-                bool found = false;
-                QString path = (*it)->fullPath;
-                QMultiMap<QString, FolderNode *>::const_iterator oldit
-                        = existingFolderNodes.constFind(path);
-                while (oldit != existingFolderNodes.constEnd() && oldit.key() == path) {
-                    if (oldit.value()->nodeType() == VirtualFolderNodeType) {
-                        VirtualFolderNode *vfn = dynamic_cast<VirtualFolderNode *>(oldit.value());
-                        if (vfn->priority() == (*it)->priority) {
-                            found = true;
-                            break;
-                        }
-                    }
-                    ++oldit;
-                }
-                if (found) {
-                    nodesToUpdate << NodePair(*it, *oldit);
-                } else {
-                    FolderNode *newNode = createFolderNode(*it);
-                    foldersToAdd << newNode;
-                    nodesToUpdate << NodePair(*it, newNode);
-                }
-            }
-        }
-        // Check subnodes
-        {
-            QMap<QString, InternalNode *>::const_iterator it = subnodes.constBegin();
-            QMap<QString, InternalNode *>::const_iterator end = subnodes.constEnd();
-
-            for ( ; it != end; ++it) {
-                bool found = false;
-                QString path = it.value()->fullPath;
-                QMultiMap<QString, FolderNode *>::const_iterator oldit
-                        = existingFolderNodes.constFind(path);
-                while (oldit != existingFolderNodes.constEnd() && oldit.key() == path) {
-                    if (oldit.value()->nodeType() == FolderNodeType) {
-                        found = true;
-                        break;
-                    }
-                    ++oldit;
-                }
-                if (found) {
-                    nodesToUpdate << NodePair(it.value(), *oldit);
-                } else {
-                    FolderNode *newNode = createFolderNode(it.value());
-                    foldersToAdd << newNode;
-                    nodesToUpdate << NodePair(it.value(), newNode);
-                }
-            }
-        }
-
-        QSet<FolderNode *> toKeep;
-        foreach (const NodePair &np, nodesToUpdate)
-            toKeep << np.second;
-
-        QMultiMap<QString, FolderNode *>::const_iterator jit = existingFolderNodes.constBegin();
-        QMultiMap<QString, FolderNode *>::const_iterator jend = existingFolderNodes.constEnd();
-        for ( ; jit != jend; ++jit)
-            if (!toKeep.contains(jit.value()))
-                foldersToRemove << jit.value();
-
-        if (!foldersToRemove.isEmpty())
-            folder->removeFolderNodes(foldersToRemove);
-        if (!foldersToAdd.isEmpty())
-            folder->addFolderNodes(foldersToAdd);
-
-        foreach (const NodePair &np, nodesToUpdate)
-            np.first->updateSubFolders(np.second);
-    }
-
-    // Makes the folder's files match this internal node's file list
-    void updateFiles(FolderNode *folder, FileType type)
-    {
-        QList<FileNode*> existingFileNodes;
-        foreach (FileNode *fileNode, folder->fileNodes()) {
-            if (fileNode->fileType() == type && !fileNode->isGenerated())
-                existingFileNodes << fileNode;
-        }
-
-        QList<FileNode*> filesToRemove;
-        FileNameList filesToAdd;
-
-        SortByPath sortByPath;
-        Utils::sort(files, sortByPath);
-        Utils::sort(existingFileNodes, sortByPath);
-
-        ProjectExplorer::compareSortedLists(existingFileNodes, files, filesToRemove, filesToAdd, sortByPath);
-
-        QList<FileNode *> nodesToAdd;
-        foreach (const FileName &file, filesToAdd)
-            nodesToAdd << new FileNode(file, type, false);
-
-        folder->removeFileNodes(filesToRemove);
-        folder->addFileNodes(nodesToAdd);
-    }
-
-    // Makes the folder's files match this internal node's file list
-    void updateResourceFiles(FolderNode *folder)
-    {
-        QList<FolderNode *> existingResourceNodes; // for resource special handling
-        foreach (FolderNode *folderNode, folder->subFolderNodes()) {
-            if (ResourceEditor::ResourceTopLevelNode *rn = dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode))
-                existingResourceNodes << rn;
-        }
-
-        QList<FolderNode *> resourcesToRemove;
-        FileNameList resourcesToAdd;
-
-        SortByPath sortByPath;
-        Utils::sort(files, sortByPath);
-        Utils::sort(existingResourceNodes, sortByPath);
-
-        ProjectExplorer::compareSortedLists(existingResourceNodes, files, resourcesToRemove, resourcesToAdd, sortByPath);
-
-        QList<FolderNode *> nodesToAdd;
-        nodesToAdd.reserve(resourcesToAdd.size());
-
-        foreach (const FileName &file, resourcesToAdd)
-            nodesToAdd.append(new ResourceEditor::ResourceTopLevelNode(file, folder));
-
-        folder->removeFolderNodes(resourcesToRemove);
-        folder->addFolderNodes(nodesToAdd);
-
-        foreach (FolderNode *fn, nodesToAdd)
-            dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(fn)->update();
-    }
-};
-}
-
-QStringList QmakePriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir, const QString &buildDir)
-{
-    QStringList result;
-    if (!reader)
-        return result;
-    result += reader->absolutePathValues(QLatin1String("VPATH"), projectDir);
-    result << projectDir; // QMAKE_ABSOLUTE_SOURCE_PATH
-    result << buildDir;
-    result.removeDuplicates();
-    return result;
-}
-
-QStringList QmakePriFileNode::fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader,
-                                       const QString &qmakeVariable, const QString &projectDir)
-{
-    QStringList vPaths;
-    if (!reader)
-        return vPaths;
-    vPaths = reader->absolutePathValues(QLatin1String("VPATH_") + qmakeVariable, projectDir);
-    vPaths += baseVPaths;
-    vPaths.removeDuplicates();
-    return vPaths;
-}
-
-QSet<FileName> QmakePriFileNode::recursiveEnumerate(const QString &folder)
-{
-    QSet<FileName> result;
-    QFileInfo fi(folder);
-    if (fi.isDir()) {
-        QDir dir(folder);
-        dir.setFilter(dir.filter() | QDir::NoDotAndDotDot);
-
-        foreach (const QFileInfo &file, dir.entryInfoList()) {
-            if (file.isDir() && !file.isSymLink())
-                result += recursiveEnumerate(file.absoluteFilePath());
-            else if (!Core::EditorManager::isAutoSaveFile(file.fileName()))
-                result += FileName(file);
-        }
-    } else if (fi.exists()) {
-        result << FileName(fi);
-    }
-    return result;
-}
-
-PriFileEvalResult QmakePriFileNode::extractValues(const EvalInput &input, ProFile *includeFileExact, ProFile *includeFileCumlative,
-                                                  const QList<QList<VariableAndVPathInformation>> &variableAndVPathInformation)
-{
-    PriFileEvalResult result;
-
-    // Figure out DEPLOYMENT and INSTALL folders
-    QStringList dynamicVariables = dynamicVarNames(input.readerExact, input.readerCumulative, input.isQt5);
-    if (includeFileExact)
-        foreach (const QString &dynamicVar, dynamicVariables) {
-            result.folders += input.readerExact->values(dynamicVar, includeFileExact);
-            // Ignore stuff from cumulative parse
-            // we are recursively enumerating all the files from those folders
-            // and add watchers for them, that's too dangerous if we get the folders
-            // wrong and enumerate the whole project tree multiple times
-        }
-
-
-    for (int i=0; i < result.folders.size(); ++i) {
-        const QFileInfo fi(result.folders.at(i));
-        if (fi.isRelative())
-            result.folders[i] = QDir::cleanPath(input.projectDir + QLatin1Char('/') + result.folders.at(i));
-    }
-
-    result.folders.removeDuplicates();
-
-    // Remove non existing items and non folders
-    QStringList::iterator it = result.folders.begin();
-    while (it != result.folders.end()) {
-        QFileInfo fi(*it);
-        if (fi.exists()) {
-            if (fi.isDir()) {
-                // keep directories
-                ++it;
-            } else {
-                // move files directly to recursiveEnumerateFiles
-                result.recursiveEnumerateFiles << FileName::fromString(*it);
-                it = result.folders.erase(it);
-            }
-        } else {
-            // do remove non exsting stuff
-            it = result.folders.erase(it);
-        }
-    }
-
-    foreach (const QString &folder, result.folders)
-        result.recursiveEnumerateFiles += recursiveEnumerate(folder);
-
-    const QVector<QmakeNodeStaticData::FileTypeData> &fileTypes = qmakeNodeStaticData()->fileTypeData;
-    // update files
-    QFileInfo tmpFi;
-    for (int i = 0; i < fileTypes.size(); ++i) {
-        FileType type = fileTypes.at(i).type;
-        const QList<VariableAndVPathInformation> &qmakeVariables = variableAndVPathInformation.at(i);
-        QSet<FileName> newFilePaths;
-        foreach (const VariableAndVPathInformation &qmakeVariable, qmakeVariables) {
-            if (includeFileExact) {
-                QStringList tmp = input.readerExact->absoluteFileValues(qmakeVariable.variable, input.projectDir, qmakeVariable.vPathsExact, includeFileExact);
-                foreach (const QString &t, tmp) {
-                    tmpFi.setFile(t);
-                    if (tmpFi.isFile())
-                        newFilePaths += FileName::fromString(t);
-                }
-            }
-            if (includeFileCumlative) {
-                QStringList tmp = input.readerCumulative->absoluteFileValues(qmakeVariable.variable, input.projectDir, qmakeVariable.vPathsCumulative, includeFileCumlative);
-                foreach (const QString &t, tmp) {
-                    tmpFi.setFile(t);
-                    if (tmpFi.isFile())
-                        newFilePaths += FileName::fromString(t);
-                }
-            }
-        }
-
-        result.foundFiles[type] = newFilePaths;
-        result.recursiveEnumerateFiles.subtract(newFilePaths);
-    }
-
-
-    for (int i = 0; i < fileTypes.size(); ++i) {
-        FileType type = fileTypes.at(i).type;
-        QSet<FileName> newFilePaths = filterFilesProVariables(type, result.foundFiles[type]);
-        newFilePaths += filterFilesRecursiveEnumerata(type, result.recursiveEnumerateFiles);
-        result.foundFiles[type] = newFilePaths;
-    }
-
-
-    return result;
-}
-
-void QmakePriFileNode::update(const Internal::PriFileEvalResult &result)
-{
-    // add project file node
-    if (m_fileNodes.isEmpty())
-        addFileNodes(QList<FileNode *>() << new FileNode(m_projectFilePath, ProjectFileType, false));
-
-    m_recursiveEnumerateFiles = result.recursiveEnumerateFiles;
-    watchFolders(result.folders.toSet());
-
-    InternalNode contents;
-    const QVector<QmakeNodeStaticData::FileTypeData> &fileTypes = qmakeNodeStaticData()->fileTypeData;
-    for (int i = 0; i < fileTypes.size(); ++i) {
-        FileType type = fileTypes.at(i).type;
-        const QSet<FileName> &newFilePaths = result.foundFiles.value(type);
-        // We only need to save this information if
-        // we are watching folders
-        if (!result.folders.isEmpty())
-            m_files[type] = newFilePaths;
-        else
-            m_files[type].clear();
-
-        if (!newFilePaths.isEmpty()) {
-            InternalNode *subfolder = new InternalNode;
-            subfolder->type = type;
-            subfolder->icon = fileTypes.at(i).icon;
-            subfolder->fullPath = m_projectDir;
-            subfolder->typeName = fileTypes.at(i).typeName;
-            subfolder->priority = -i;
-            subfolder->displayName = fileTypes.at(i).typeName;
-            contents.virtualfolders.append(subfolder);
-            // create the hierarchy with subdirectories
-            subfolder->create(m_projectDir, newFilePaths, type);
-        }
-    }
-
-    contents.updateSubFolders(this);
-}
-
-void QmakePriFileNode::watchFolders(const QSet<QString> &folders)
-{
-    QSet<QString> toUnwatch = m_watchedFolders;
-    toUnwatch.subtract(folders);
-
-    QSet<QString> toWatch = folders;
-    toWatch.subtract(m_watchedFolders);
-
-    if (!toUnwatch.isEmpty())
-        m_project->unwatchFolders(toUnwatch.toList(), this);
-    if (!toWatch.isEmpty())
-        m_project->watchFolders(toWatch.toList(), this);
-
-    m_watchedFolders = folders;
-}
-
-bool QmakePriFileNode::folderChanged(const QString &changedFolder, const QSet<FileName> &newFiles)
-{
-    //qDebug()<<"########## QmakePriFileNode::folderChanged";
-    // So, we need to figure out which files changed.
-
-    QSet<FileName> addedFiles = newFiles;
-    addedFiles.subtract(m_recursiveEnumerateFiles);
-
-    QSet<FileName> removedFiles = m_recursiveEnumerateFiles;
-    removedFiles.subtract(newFiles);
-
-    foreach (const FileName &file, removedFiles) {
-        if (!file.isChildOf(FileName::fromString(changedFolder)))
-            removedFiles.remove(file);
-    }
-
-    if (addedFiles.isEmpty() && removedFiles.isEmpty())
-        return false;
-
-    m_recursiveEnumerateFiles = newFiles;
-
-    // Apply the differences
-    // per file type
-    const QVector<QmakeNodeStaticData::FileTypeData> &fileTypes = qmakeNodeStaticData()->fileTypeData;
-    for (int i = 0; i < fileTypes.size(); ++i) {
-        FileType type = fileTypes.at(i).type;
-        QSet<FileName> add = filterFilesRecursiveEnumerata(type, addedFiles);
-        QSet<FileName> remove = filterFilesRecursiveEnumerata(type, removedFiles);
-
-        if (!add.isEmpty() || !remove.isEmpty()) {
-            // Scream :)
-//            qDebug()<<"For type"<<fileTypes.at(i).typeName<<"\n"
-//                    <<"added files"<<add<<"\n"
-//                    <<"removed files"<<remove;
-
-            m_files[type].unite(add);
-            m_files[type].subtract(remove);
-        }
-    }
-
-    // Now apply stuff
-    InternalNode contents;
-    for (int i = 0; i < fileTypes.size(); ++i) {
-        FileType type = fileTypes.at(i).type;
-        if (!m_files[type].isEmpty()) {
-            InternalNode *subfolder = new InternalNode;
-            subfolder->type = type;
-            subfolder->icon = fileTypes.at(i).icon;
-            subfolder->fullPath = m_projectDir;
-            subfolder->typeName = fileTypes.at(i).typeName;
-            subfolder->priority = -i;
-            subfolder->displayName = fileTypes.at(i).typeName;
-            contents.virtualfolders.append(subfolder);
-            // create the hierarchy with subdirectories
-            subfolder->create(m_projectDir, m_files[type], type);
-        }
-    }
-
-    contents.updateSubFolders(this);
-    return true;
-}
-
-bool QmakePriFileNode::deploysFolder(const QString &folder) const
-{
-    QString f = folder;
-    const QChar slash = QLatin1Char('/');
-    if (!f.endsWith(slash))
-        f.append(slash);
-
-    foreach (const QString &wf, m_watchedFolders) {
-        if (f.startsWith(wf)
-            && (wf.endsWith(slash)
-                || (wf.length() < f.length() && f.at(wf.length()) == slash)))
-            return true;
-    }
-    return false;
-}
-
-QList<RunConfiguration *> QmakePriFileNode::runConfigurations() const
-{
-    QmakeRunConfigurationFactory *factory = QmakeRunConfigurationFactory::find(m_project->activeTarget());
-    if (factory)