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

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 1bf1425422a04cd2638407970edf3f40c9544c70
Author: Adam Majer <adamm at zombino.com>
Date:   Fri Oct 24 18:27:16 2014 -0500

    Code style fixes and release
---
 debian/changelog                           |  4 ++--
 debian/patches/always_autotect_qt_versions | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca345a5..fe57cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-qtcreator (3.2.1+dfsg-6) UNRELEASED; urgency=medium
+qtcreator (3.2.1+dfsg-6) unstable; urgency=medium
 
   * Fix previous patch so autodetected Qt versions can be used and saved
     in "kits"
 
- -- Adam Majer <adamm at zombino.com>  Thu, 23 Oct 2014 23:44:13 -0500
+ -- Adam Majer <adamm at zombino.com>  Fri, 24 Oct 2014 18:28:22 -0500
 
 qtcreator (3.2.1+dfsg-5) unstable; urgency=medium
 
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index 94e6910..28ad93b 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-23 23:35:56.154526332 -0500
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2014-10-24 18:25:44.855836576 -0500
 @@ -139,7 +139,7 @@
  static BaseQtVersion::QmakeBuildConfigs qmakeBuildConfigFromCmdArgs(QList<QMakeAssignment> *assignments,
                                                                      BaseQtVersion::QmakeBuildConfigs defaultBuildConfig);
@@ -35,7 +35,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  }
  
 -static void findSystemQt()
-+static void addSystemVersion(FileName qmake_fn)
++static void addSystemQtVersion(FileName qmake_fn)
  {
 -    QList<FileName> systemQMakes;
 -    FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
@@ -58,8 +58,8 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 +        qmakePathsFromQtChooser << systemQMakePath;
 +    qmakePathsFromQtChooser.sort();
 +
-+    QMap<QString,int> currentAutoVersions;
-+    for (QMap<int, BaseQtVersion*>::const_iterator i = m_versions.begin(); i != m_versions.end(); ++i) {
++    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());
 +        }
@@ -70,7 +70,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 -        if (version) {
 -             version->setDisplayName(BaseQtVersion::defaultDisplayName(version->qtVersionString(), qmakePath, true));
 -             m_versions.insert(version->uniqueId(), version);
-+    QMap<QString,int>::const_iterator av = currentAutoVersions.begin();
++    QMap<QString, int>::const_iterator av = currentAutoVersions.begin();
 +    QStringList::const_iterator dv = qmakePathsFromQtChooser.begin();
 +    while (av != currentAutoVersions.end() && dv != qmakePathsFromQtChooser.end()) {
 +        if (av.key() == *dv) {
@@ -84,7 +84,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 +        }
 +        else { // av.key() > *dv
 +            // detected version is missing, add it
-+            addSystemVersion(FileName::fromString(*dv));
++            addSystemQtVersion(FileName::fromString(*dv));
 +            ++dv;
 +        }
 +    }
@@ -95,7 +95,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 +    }
 +
 +    while (dv != qmakePathsFromQtChooser.end()) {
-+        addSystemVersion(FileName::fromString(*dv));
++        addSystemQtVersion(FileName::fromString(*dv));
 +        ++dv;
      }
  }

-- 
qtcreator packaging