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

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 725f0d4abca4442c7f517a1300bd067febf00509
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Nov 18 10:44:06 2014 -0600

    Fix segfault caused by missing qmake
    
    In bfbe36955bb6d660d5f629c81fc5c3843dc4aa94, when doing modifications
    to support kits by autodetected Qt versions, a check for
    incomplete/invalid Qt installations ended up being dropped,
    somehow. Re-enable this check.
---
 debian/changelog                           | 7 +++++++
 debian/patches/always_autotect_qt_versions | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe57cce..5dcf9f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtcreator (3.2.1+dfsg-7) unstable; urgency=medium
+
+  * Adds a missing check for a partially installed Qt version that is
+    reported in qtchooser but is lacking qmake. (closes: #770007)
+
+ -- Adam Majer <adamm at zombino.com>  Tue, 18 Nov 2014 09:55:32 -0600
+
 qtcreator (3.2.1+dfsg-6) unstable; urgency=medium
 
   * Fix previous patch so autodetected Qt versions can be used and saved
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index 28ad93b..71741ab 100644
--- a/debian/patches/always_autotect_qt_versions
+++ b/debian/patches/always_autotect_qt_versions
@@ -1,7 +1,7 @@
 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-24 18:25:44.855836576 -0500
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-11-18 10:40:46.775871633 -0600
 @@ -139,7 +139,7 @@
  static BaseQtVersion::QmakeBuildConfigs qmakeBuildConfigFromCmdArgs(QList<QMakeAssignment> *assignments,
                                                                      BaseQtVersion::QmakeBuildConfigs defaultBuildConfig);
@@ -30,7 +30,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  
      emit m_instance->qtVersionsLoaded();
      emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
-@@ -435,27 +432,54 @@
+@@ -435,27 +432,55 @@
      m_writer->save(data, Core::ICore::mainWindow());
  }
  
@@ -43,7 +43,8 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 -    if (!systemQMakePath.isNull())
 -        systemQMakes << systemQMakePath;
 +    BaseQtVersion *v = QtVersionFactory::createQtVersionFromQMakePath(qmake_fn, true);
-+    m_versions.insert(v->uniqueId(), v);
++    if (v)
++        m_versions.insert(v->uniqueId(), v);
 +}
  
 +static void updateSystemQt()
@@ -54,7 +55,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 -    foreach (const QString &qmakePath, qmakePathsFromQtChooser) {
 -        FileName qmake = FileName::fromString(qmakePath);
 -        systemQMakes << qmake;
-+    if (!qmakePathsFromQtChooser.contains(systemQMakePath))
++    if (!systemQMakePath.isEmpty() && !qmakePathsFromQtChooser.contains(systemQMakePath))
 +        qmakePathsFromQtChooser << systemQMakePath;
 +    qmakePathsFromQtChooser.sort();
 +

-- 
qtcreator packaging