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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b0840ae4231bb998a8c8374b31f54961c1b69bc4
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Oct 21 17:07:30 2014 -0300

    Add missing part of the patch.
    
    I missed it when doing the backport.
---
 debian/patches/qt_versions_trough_qtchooser.patch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/patches/qt_versions_trough_qtchooser.patch b/debian/patches/qt_versions_trough_qtchooser.patch
index 4978a43..8b61ac4 100644
--- a/debian/patches/qt_versions_trough_qtchooser.patch
+++ b/debian/patches/qt_versions_trough_qtchooser.patch
@@ -10,8 +10,8 @@ Date:   Thu Oct 16 13:52:28 2014 +0200
  src/plugins/qtsupport/qtchooserqtgatherer.cpp |  117 ++++++++++++++++++++++++++
  src/plugins/qtsupport/qtchooserqtgatherer.h   |   57 ++++++++++++
  src/plugins/qtsupport/qtsupport.pro           |    2 
- src/plugins/qtsupport/qtversionmanager.cpp    |   22 +++-
- 4 files changed, 192 insertions(+), 6 deletions(-)
+ src/plugins/qtsupport/qtversionmanager.cpp    |   23 +++--
+ 4 files changed, 193 insertions(+), 6 deletions(-)
 
 --- /dev/null
 +++ b/src/plugins/qtsupport/qtchooserqtgatherer.cpp
@@ -221,9 +221,11 @@ Date:   Thu Oct 16 13:52:28 2014 +0200
  
  #include <coreplugin/icore.h>
  #include <coreplugin/helpmanager.h>
-@@ -437,14 +438,23 @@ static void saveQtVersions()
+@@ -436,15 +437,25 @@ static void saveQtVersions()
+ 
  static void findSystemQt()
  {
++    QList<FileName> systemQMakes;
      FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
 -    if (systemQMakePath.isNull())
 -        return;

-- 
qtcreator packaging