[SCM] qtcreator packaging branch, master, updated. debian/3.6.0-1-9-g8c36646

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 48840dc1c976a46a704d2fd35db7a9b27ebdb9ff
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 26 16:01:21 2016 -0600

    Add a patch to get correct qmake path, not just chooser symlink
    
    This apparently resulted in Qt versions being detected as unknown.
---
 debian/changelog                                 |  5 +++
 debian/patches/fix_qt_version_autodetection.diff | 39 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f4f964e..2f923f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ qtcreator (3.6.0-2) UNRELEASED; urgency=medium
       + remove unnecessary dh_auto_clean_override
   * debian/qtcreator.install:
       + no longer install unnecessary qtcreator.sh
+  * debian/patches/fix_qt_version_autodetection.diff
+      + in certain situations it was possible for a Qt version to be
+        autodetected as a new installation even it was already found and
+        previosuly saved. Add a patch by Benjamin Zeller to fix this issue.
+        Thanks to Timo Jyrinki for report (closes: #803937)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Jan 2016 15:03:51 -0600
 
diff --git a/debian/patches/fix_qt_version_autodetection.diff b/debian/patches/fix_qt_version_autodetection.diff
new file mode 100644
index 0000000..5574678
--- /dev/null
+++ b/debian/patches/fix_qt_version_autodetection.diff
@@ -0,0 +1,39 @@
+Author: Benjamin Zeller <benjamin.zeller at canonical.com>
+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
+
+--- qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-10-21 17:53:48.000000000 +0200
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-10-22 11:50:21.323455563 +0200
+@@ -458,7 +458,7 @@
+
+     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());
+         }
+     }
+
+--- qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-08-18 12:02:51.000000000 +0200
++++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-11-02 12:36:14.974481823 +0100
+@@ -88,8 +88,15 @@
+ 
+         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.
+
diff --git a/debian/patches/series b/debian/patches/series
index d09db82..db8057a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@ 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

-- 
qtcreator packaging