[SCM] qtcreator packaging branch, master, updated. debian/3.2.1+dfsg-4-1-g8ee00b9

[Adam Majer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=8ee00b9

The following commit has been merged in the master branch:
commit 8ee00b984308ea3c6ae17a1cc9b53ca354b56b5f
Author: Adam Majer <adamm at zombino.com>
Date:   Wed Oct 22 12:31:02 2014 -0500

    Always autodetect Qt versions and display them in Autodetected section, instead of Manual
---
 debian/changelog                           |  7 +++++
 debian/patches/always_autotect_qt_versions | 42 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a70d497..3a4eaf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtcreator (3.2.1+dfsg-5) unstable; urgency=medium
+
+  * Modify Qt autodetection to always have up-to-date-list of installed Qt
+    versions
+
+ -- Adam Majer <adamm at zombino.com>  Wed, 22 Oct 2014 12:30:00 -0500
+
 qtcreator (3.2.1+dfsg-4) unstable; urgency=medium
 
   * Refresh from_header_to_body.diff.
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
new file mode 100644
index 0000000..38094f3
--- /dev/null
+++ b/debian/patches/always_autotect_qt_versions
@@ -0,0 +1,42 @@
+Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+===================================================================
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2014-10-22 21:36:36.474107687 -0500
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-10-22 21:39:50.470102437 -0500
+@@ -168,14 +168,11 @@
+     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
++    findSystemQt();
+ 
+     emit m_instance->qtVersionsLoaded();
+     emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
+@@ -424,6 +421,9 @@
+ 
+     int count = 0;
+     foreach (BaseQtVersion *qtv, m_versions) {
++        if (qtv->isAutodetected())
++            continue;
++
+         QVariantMap tmp = qtv->toMap();
+         if (tmp.isEmpty())
+             continue;
+@@ -451,7 +451,7 @@
+     }
+ 
+     foreach (const FileName &qmakePath, systemQMakes) {
+-        BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qmakePath);
++        BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(qmakePath, true);
+         if (version) {
+              version->setDisplayName(BaseQtVersion::defaultDisplayName(version->qtVersionString(), qmakePath, true));
+              m_versions.insert(version->uniqueId(), version);
diff --git a/debian/patches/series b/debian/patches/series
index 7faa612..adcf9c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ qt_versions_trough_qtchooser.patch
 # Debian patches.
 botan_system_lib.diff
 from_header_to_body.diff
+always_autotect_qt_versions

-- 
qtcreator packaging