[SCM] qtcreator packaging branch, master, updated. debian/3.4.1+dfsg-2-6-ge3fe5a8
Adam Majer
adamm at moszumanska.debian.org
Tue Aug 25 13:57:49 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=aa85942
The following commit has been merged in the master branch:
commit aa859424d54ba163829e8345f9b8c91f2c3fd157
Author: Adam Majer <adamm at zombino.com>
Date: Wed Aug 19 17:13:23 2015 -0500
Update/refresh patches
---
debian/changelog | 3 +
debian/patches/02_use_x-terminal-emulator.diff | 4 +-
debian/patches/always_autotect_qt_versions | 64 +++---
debian/patches/botan_system_lib.diff | 32 +--
debian/patches/fix_documentation_path.diff | 8 +-
debian/patches/qt_versions_trough_qtchooser.patch | 258 ----------------------
debian/patches/rpath_nonlinux.diff | 12 +-
debian/patches/series | 1 -
8 files changed, 61 insertions(+), 321 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 29a3dfc..2562862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qtcreator (3.5.0+dfsg-1) UNRELEASED; urgency=medium
* debian/control:
+ Bump build dependency to minumum of Qt 5.4, as per upstream.
+ Remove conflict resolution statements related to Wheezy (oldstable)
+ * debian/patches:
+ + drop qt_versions_trough_qtchooser.patch - incorporated upstream
+ + update always_autotect_qt_versions
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 19 Aug 2015 15:58:02 -0500
diff --git a/debian/patches/02_use_x-terminal-emulator.diff b/debian/patches/02_use_x-terminal-emulator.diff
index dd936e3..b5103a9 100644
--- a/debian/patches/02_use_x-terminal-emulator.diff
+++ b/debian/patches/02_use_x-terminal-emulator.diff
@@ -7,8 +7,8 @@ Author: Fathi Boudra <fabo at debian.org>
Index: qtcreator/src/libs/utils/consoleprocess_unix.cpp
===================================================================
---- qtcreator.orig/src/libs/utils/consoleprocess_unix.cpp 2015-06-24 23:59:30.295412547 -0500
-+++ qtcreator/src/libs/utils/consoleprocess_unix.cpp 2015-06-24 23:59:30.295412547 -0500
+--- qtcreator.orig/src/libs/utils/consoleprocess_unix.cpp 2015-08-19 16:22:42.044473322 -0500
++++ qtcreator/src/libs/utils/consoleprocess_unix.cpp 2015-08-19 16:22:42.040473369 -0500
@@ -353,6 +353,7 @@
static const Terminal knownTerminals[] =
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index 45014c5..c74f001 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 2015-06-25 01:19:23.559518183 -0500
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp 2015-06-25 01:19:23.555518237 -0500
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp 2015-08-19 17:05:40.292526401 -0500
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp 2015-08-19 18:00:11.391353950 -0500
@@ -102,7 +102,7 @@
return a->qtVersion() > b->qtVersion() || (a->qtVersion() == b->qtVersion() && a->uniqueId() < b->uniqueId());
}
@@ -30,65 +30,61 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
emit m_instance->qtVersionsLoaded();
emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
-@@ -398,28 +395,57 @@
- m_writer->save(data, Core::ICore::mainWindow());
+@@ -442,23 +439,57 @@
+ return foundQMakes.toList();
}
-static void findSystemQt()
+static void addSystemQtVersion(FileName qmake_fn)
- {
-- QList<FileName> systemQMakes;
-- FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
--
-- if (!systemQMakePath.isNull())
-- systemQMakes << systemQMakePath;
++{
+ BaseQtVersion *v = QtVersionFactory::createQtVersionFromQMakePath(qmake_fn, true, QLatin1String("PATH"));
+ if (v) {
+ v->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmake_fn, true));
+ m_versions.insert(v->uniqueId(), v);
+ }
+}
-
++
+static void updateSystemQt()
-+{
-+ QString systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment()).toString();
- QStringList qmakePathsFromQtChooser = gatherQmakePathsFromQtChooser();
-- qmakePathsFromQtChooser.removeAll(systemQMakePath.toString());
-- foreach (const QString &qmakePath, qmakePathsFromQtChooser) {
-- FileName qmake = FileName::fromString(qmakePath);
-- systemQMakes << qmake;
+ {
+- FileNameList systemQMakes;
+ FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
+- if (!systemQMakePath.isEmpty())
+- systemQMakes << systemQMakePath;
++ FileNameList qmakePathsFromQtChooser = gatherQmakePathsFromQtChooser();
+ if (!qmakePathsFromQtChooser.contains(systemQMakePath))
+ qmakePathsFromQtChooser << systemQMakePath;
-+ qmakePathsFromQtChooser.sort();
-+
++ std::sort(qmakePathsFromQtChooser.begin(), qmakePathsFromQtChooser.end());
+
+- systemQMakes.append(gatherQmakePathsFromQtChooser());
+- systemQMakes.removeDuplicates();
+ 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());
+ }
- }
++ }
- foreach (const FileName &qmakePath, systemQMakes) {
-- BaseQtVersion *version =
-- QtVersionFactory::createQtVersionFromQMakePath(qmakePath, true, QLatin1String("PATH"));
+- BaseQtVersion *version
+- = QtVersionFactory::createQtVersionFromQMakePath(qmakePath, false, QLatin1String("PATH"));
- if (version) {
-- version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
-- m_versions.insert(version->uniqueId(), version);
-+ QMap<QString, int>::const_iterator av = currentAutoVersions.begin();
-+ QStringList::const_iterator dv = qmakePathsFromQtChooser.begin();
+- version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
+- m_versions.insert(version->uniqueId(), version);
++ QMap<QString, int>::const_iterator av = currentAutoVersions.begin(); // auto-saved versions
++ FileNameList::const_iterator dv = qmakePathsFromQtChooser.begin(); // detected versions
+ while (av != currentAutoVersions.end() && dv != qmakePathsFromQtChooser.end()) {
-+ if (av.key() == *dv) {
++ if (av.key() == dv->toString()) {
+ ++av;
+ ++dv;
- }
-+ else if (av.key() < *dv) {
++ }
++ else if (av.key() < dv->toString()) {
+ // currently saved automatic version has been removed
+ m_versions.remove(*av);
+ ++av;
-+ }
-+ else { // av.key() > *dv
+ }
++ else { // av.key() > dv->toString()
+ // detected version is missing, add it
-+ addSystemQtVersion(FileName::fromString(*dv));
++ addSystemQtVersion(*dv);
+ ++dv;
+ }
+ }
@@ -99,7 +95,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+ }
+
+ while (dv != qmakePathsFromQtChooser.end()) {
-+ addSystemQtVersion(FileName::fromString(*dv));
++ addSystemQtVersion(*dv);
+ ++dv;
}
}
diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index 082c803..ce95590 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -11,10 +11,10 @@ Last-Reviewed: 2014-08-19
src/libs/ssh/sshkeypasswordretriever_p.h | 1
6 files changed, 21 insertions(+), 57 deletions(-)
-Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility.cpp
+Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
===================================================================
---- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshcryptofacility.cpp 2015-03-07 17:26:46.077464409 -0600
-+++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility.cpp 2015-03-07 17:26:46.073464409 -0600
+--- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp 2015-08-19 16:29:56.815550479 -0500
++++ qtcreator/src/libs/ssh/sshcryptofacility.cpp 2015-08-19 16:29:56.807550569 -0500
@@ -38,6 +38,11 @@
#include "sshpacket_p.h"
@@ -27,10 +27,10 @@ Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility.cpp
#include <QDebug>
#include <QList>
-Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility_p.h
+Index: qtcreator/src/libs/ssh/sshcryptofacility_p.h
===================================================================
---- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshcryptofacility_p.h 2015-03-07 17:26:46.077464409 -0600
-+++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility_p.h 2015-03-07 17:26:46.073464409 -0600
+--- qtcreator.orig/src/libs/ssh/sshcryptofacility_p.h 2015-08-19 16:29:56.815550479 -0500
++++ qtcreator/src/libs/ssh/sshcryptofacility_p.h 2015-08-19 16:29:56.807550569 -0500
@@ -32,9 +32,11 @@
#define SSHCRYPTOFACILITY_P_H
@@ -43,11 +43,11 @@ Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshcryptofacility_p.h
namespace QSsh {
namespace Internal {
-Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeyexchange.cpp
+Index: qtcreator/src/libs/ssh/sshkeyexchange.cpp
===================================================================
---- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshkeyexchange.cpp 2015-03-07 17:26:46.077464409 -0600
-+++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeyexchange.cpp 2015-03-07 17:26:46.073464409 -0600
-@@ -37,6 +37,12 @@
+--- qtcreator.orig/src/libs/ssh/sshkeyexchange.cpp 2015-08-19 16:29:56.815550479 -0500
++++ qtcreator/src/libs/ssh/sshkeyexchange.cpp 2015-08-19 16:29:56.807550569 -0500
+@@ -38,6 +38,12 @@
#include "sshincomingpacket_p.h"
#include <botan/botan.h>
@@ -60,10 +60,10 @@ Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeyexchange.cpp
#ifdef CREATOR_SSH_DEBUG
#include <iostream>
-Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeygenerator.cpp
+Index: qtcreator/src/libs/ssh/sshkeygenerator.cpp
===================================================================
---- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshkeygenerator.cpp 2015-03-07 17:26:46.077464409 -0600
-+++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeygenerator.cpp 2015-03-07 17:26:46.073464409 -0600
+--- qtcreator.orig/src/libs/ssh/sshkeygenerator.cpp 2015-08-19 16:29:56.815550479 -0500
++++ qtcreator/src/libs/ssh/sshkeygenerator.cpp 2015-08-19 16:29:56.807550569 -0500
@@ -36,6 +36,11 @@
#include "sshpacket_p.h"
@@ -76,10 +76,10 @@ Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeygenerator.cpp
#include <QDateTime>
#include <QInputDialog>
-Index: qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeypasswordretriever_p.h
+Index: qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h
===================================================================
---- qtcreator-3.4.0+dfsg~b1.orig/src/libs/ssh/sshkeypasswordretriever_p.h 2015-03-07 17:26:46.077464409 -0600
-+++ qtcreator-3.4.0+dfsg~b1/src/libs/ssh/sshkeypasswordretriever_p.h 2015-03-07 17:26:46.073464409 -0600
+--- qtcreator.orig/src/libs/ssh/sshkeypasswordretriever_p.h 2015-08-19 16:29:56.815550479 -0500
++++ qtcreator/src/libs/ssh/sshkeypasswordretriever_p.h 2015-08-19 16:29:56.811550523 -0500
@@ -31,6 +31,7 @@
#define KEYPASSWORDRETRIEVER_H
diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
index fcaaa01..9e67241 100644
--- a/debian/patches/fix_documentation_path.diff
+++ b/debian/patches/fix_documentation_path.diff
@@ -1,8 +1,8 @@
-Index: qtcreator-3.4.0+dfsg~b1/src/plugins/coreplugin/icore.cpp
+Index: qtcreator/src/plugins/coreplugin/icore.cpp
===================================================================
---- qtcreator-3.4.0+dfsg~b1.orig/src/plugins/coreplugin/icore.cpp 2015-03-07 17:33:01.497454249 -0600
-+++ qtcreator-3.4.0+dfsg~b1/src/plugins/coreplugin/icore.cpp 2015-03-07 17:33:01.493454250 -0600
-@@ -411,7 +411,7 @@
+--- qtcreator.orig/src/plugins/coreplugin/icore.cpp 2015-08-19 17:12:58.478729450 -0500
++++ qtcreator/src/plugins/coreplugin/icore.cpp 2015-08-19 17:12:58.474729501 -0500
+@@ -426,7 +426,7 @@
QString ICore::documentationPath()
{
const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
diff --git a/debian/patches/qt_versions_trough_qtchooser.patch b/debian/patches/qt_versions_trough_qtchooser.patch
deleted file mode 100644
index 2d2fffc..0000000
--- a/debian/patches/qt_versions_trough_qtchooser.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-commit f5ef9451c30b1b3c9c6f7b314148af22e34d606e
-Author: Sune Vuorela <sune at vuorela.dk>
-Date: Thu Oct 16 13:52:28 2014 +0200
-
- Gather Qt versions from qtchooser on first run
-
- Change-Id: I33ae062c3225fb3d7b7d1a62e0e287d326bb4276
-
-Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.cpp 2015-06-25 01:18:51.731947228 -0500
-@@ -0,0 +1,117 @@
-+/****************************************************************************
-+ * *
-+ ** Copyright (C) 2014 Sune Vuorela <sune at kde.org>
-+ ** Contact: http://www.qt-project.org/
-+ **
-+ ** This file is part of Qt Creator
-+ **
-+ ** $QT_BEGIN_LICENSE:BSD$
-+ ** You may use this file under the terms of the BSD license as follows:
-+ **
-+ ** "Redistribution and use in source and binary forms, with or without
-+ ** modification, are permitted provided that the following conditions are
-+ ** met:
-+ ** * Redistributions of source code must retain the above copyright
-+ ** notice, this list of conditions and the following disclaimer.
-+ ** * Redistributions in binary form must reproduce the above copyright
-+ ** notice, this list of conditions and the following disclaimer in
-+ ** the documentation and/or other materials provided with the
-+ ** distribution.
-+ ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-+ ** of its contributors may be used to endorse or promote products derived
-+ ** from this software without specific prior written permission.
-+ **
-+ **
-+ ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-+ **
-+ ** $QT_END_LICENSE$
-+ **
-+ ****************************************************************************/
-+
-+#include "qtchooserqtgatherer.h"
-+#include <QStandardPaths>
-+#include <QProcess>
-+#include <QSet>
-+
-+namespace QtSupport {
-+namespace Internal {
-+
-+/**
-+ * @brief extractPath extracts the path component from the QTTOOLDIR line in the qtchooser -print-env output
-+ * @param data QTTOOLDIR line in qtchooser output
-+ * @return path extracted
-+ */
-+static QString extractPath(const QByteArray &data)
-+{
-+ QByteArray data2 = data.left(data.length() - 1); // remove end apostrophe
-+ QByteArray data3 = data2.right(data2.length() - 11); // remove QTTOOLDIR="
-+ return QString::fromLocal8Bit(data3);
-+}
-+
-+/**
-+ * @brief runQtChooser executes qtchooser in a process and returns it's output
-+ * @param qtchooser path to qtchooser
-+ * @param args arguments passed to qtchooser
-+ * @return output of the qtchooser command as a list of bytearrays.
-+ */
-+static QList<QByteArray> runQtChooser(const QString &qtchooser, const QStringList &args)
-+{
-+ QProcess p;
-+ p.start(qtchooser,args);
-+ bool success = p.waitForFinished();
-+ if (!success)
-+ return QList<QByteArray>();
-+
-+ QByteArray outputString = p.readAllStandardOutput();
-+ QList<QByteArray> outputs = outputString.split('
');
-+ return outputs;
-+}
-+
-+/**
-+ * @brief qmakePath asks qtchooser for the qmake path of a given version
-+ * @param qtchooser path to qtchooser
-+ * @param version the version according to qtchooser output
-+ * @return
-+ */
-+static QString qmakePath(const QString &qtchooser, const QString &version)
-+{
-+ QList<QByteArray> outputs = runQtChooser(qtchooser, QStringList()
-+ << QStringLiteral("-qt=%1").arg(version)
-+ << QStringLiteral("-print-env"));
-+ foreach (const QByteArray &output, outputs) {
-+ if (output.startsWith("QTTOOLDIR=\""))
-+ return QStandardPaths::findExecutable(QStringLiteral("qmake"), QStringList()
-+ << extractPath(output));
-+ }
-+ return QString();
-+}
-+
-+QStringList gatherQmakePathsFromQtChooser()
-+{
-+ const QString qtchooser = QStandardPaths::findExecutable(QStringLiteral("qtchooser"));
-+ if (qtchooser.isNull())
-+ return QList<QString>();
-+
-+ QList<QByteArray> versions = runQtChooser(qtchooser, QStringList()
-+ << QStringLiteral("-l"));
-+
-+ QSet<QString> foundQMakes;
-+ foreach (const QByteArray &version, versions) {
-+ QString possibleQMake = qmakePath(qtchooser, QString::fromLocal8Bit(version));
-+ if (!possibleQMake.isEmpty())
-+ foundQMakes << possibleQMake;
-+ }
-+ return QStringList(foundQMakes.toList());
-+}
-+} // namespace Internal
-+} // namespace QtSupport
-Index: qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ qtcreator/src/plugins/qtsupport/qtchooserqtgatherer.h 2015-06-25 01:18:51.731947228 -0500
-@@ -0,0 +1,57 @@
-+/****************************************************************************
-+ * *
-+ ** Copyright (C) 2014 Sune Vuorela <sune at kde.org>
-+ ** Contact: http://www.qt-project.org/
-+ **
-+ ** This file is part of Qt Creator.
-+ **
-+ ** $QT_BEGIN_LICENSE:BSD$
-+ ** You may use this file under the terms of the BSD license as follows:
-+ **
-+ ** "Redistribution and use in source and binary forms, with or without
-+ ** modification, are permitted provided that the following conditions are
-+ ** met:
-+ ** * Redistributions of source code must retain the above copyright
-+ ** notice, this list of conditions and the following disclaimer.
-+ ** * Redistributions in binary form must reproduce the above copyright
-+ ** notice, this list of conditions and the following disclaimer in
-+ ** the documentation and/or other materials provided with the
-+ ** distribution.
-+ ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-+ ** of its contributors may be used to endorse or promote products derived
-+ ** from this software without specific prior written permission.
-+ **
-+ **
-+ ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-+ **
-+ ** $QT_END_LICENSE$
-+ **
-+ ****************************************************************************/
-+
-+
-+#ifndef QTCHOOSERQTGATHERER_H
-+#define QTCHOOSERQTGATHERER_H
-+#include <QList>
-+#include <QString>
-+
-+namespace QtSupport {
-+namespace Internal {
-+ /**
-+ * @brief gatherQmakePathsFromQtChooser asks qtchooser for available qmakes
-+ * @return list of paths to qmakes found with qtchooser
-+ */
-+ QStringList gatherQmakePathsFromQtChooser();
-+} // namespace Internal
-+} // namespace QtSupport
-+
-+#endif // QTCHOOSERQTGATHERER_H
-Index: qtcreator/src/plugins/qtsupport/qtsupport.pro
-===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtsupport.pro 2015-06-25 01:18:51.735947174 -0500
-+++ qtcreator/src/plugins/qtsupport/qtsupport.pro 2015-06-25 01:18:51.731947228 -0500
-@@ -7,6 +7,7 @@
- include(../../shared/proparser/proparser.pri)
-
- HEADERS += \
-+ qtchooserqtgatherer.h \
- codegenerator.h \
- codegensettings.h \
- codegensettingspage.h \
-@@ -39,6 +40,7 @@
- winceqtversion.h
-
- SOURCES += \
-+ qtchooserqtgatherer.cpp \
- codegenerator.cpp \
- codegensettings.cpp \
- codegensettingspage.cpp \
-Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
-===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp 2015-06-25 01:18:51.735947174 -0500
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp 2015-06-25 01:18:51.731947228 -0500
-@@ -34,6 +34,7 @@
- #include "qtversionfactory.h"
- #include "baseqtversion.h"
- #include "qtsupportconstants.h"
-+#include "qtchooserqtgatherer.h"
-
- #include <coreplugin/icore.h>
- #include <coreplugin/helpmanager.h>
-@@ -399,15 +400,26 @@
-
- static void findSystemQt()
- {
-+ QList<FileName> systemQMakes;
- FileName systemQMakePath = BuildableHelperLibrary::findSystemQt(Environment::systemEnvironment());
-- if (systemQMakePath.isNull())
-- return;
-
-- BaseQtVersion *version
-- = QtVersionFactory::createQtVersionFromQMakePath(systemQMakePath, false, QLatin1String("PATH"));
-- if (version) {
-- version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(systemQMakePath, true));
-- m_versions.insert(version->uniqueId(), version);
-+ if (!systemQMakePath.isNull())
-+ systemQMakes << systemQMakePath;
-+
-+ QStringList qmakePathsFromQtChooser = gatherQmakePathsFromQtChooser();
-+ qmakePathsFromQtChooser.removeAll(systemQMakePath.toString());
-+ foreach (const QString &qmakePath, qmakePathsFromQtChooser) {
-+ FileName qmake = FileName::fromString(qmakePath);
-+ systemQMakes << qmake;
-+ }
-+
-+ foreach (const FileName &qmakePath, systemQMakes) {
-+ BaseQtVersion *version =
-+ QtVersionFactory::createQtVersionFromQMakePath(qmakePath, true, QLatin1String("PATH"));
-+ if (version) {
-+ version->setUnexpandedDisplayName(BaseQtVersion::defaultUnexpandedDisplayName(qmakePath, true));
-+ m_versions.insert(version->uniqueId(), version);
-+ }
- }
- }
-
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index fc8d2c6..27a4237 100644
--- a/debian/patches/rpath_nonlinux.diff
+++ b/debian/patches/rpath_nonlinux.diff
@@ -13,8 +13,8 @@ Forwarded: no
Index: qtcreator/src/rpath.pri
===================================================================
---- qtcreator.orig/src/rpath.pri 2015-06-25 01:14:15.299679763 -0500
-+++ qtcreator/src/rpath.pri 2015-06-25 01:14:15.291679873 -0500
+--- qtcreator.orig/src/rpath.pri 2015-08-19 16:22:52.188356358 -0500
++++ qtcreator/src/rpath.pri 2015-08-19 16:22:52.184356405 -0500
@@ -1,6 +1,6 @@
macx {
QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../,-rpath, at executable_path/../
@@ -25,8 +25,8 @@ Index: qtcreator/src/rpath.pri
QMAKE_RPATHDIR += \$\$ORIGIN
Index: qtcreator/src/qtcreatorplugin.pri
===================================================================
---- qtcreator.orig/src/qtcreatorplugin.pri 2015-06-25 01:14:15.299679763 -0500
-+++ qtcreator/src/qtcreatorplugin.pri 2015-06-25 01:14:15.295679819 -0500
+--- qtcreator.orig/src/qtcreatorplugin.pri 2015-08-19 16:22:52.188356358 -0500
++++ qtcreator/src/qtcreatorplugin.pri 2015-08-19 16:22:52.184356405 -0500
@@ -91,7 +91,7 @@
TEMPLATE = lib
@@ -38,8 +38,8 @@ Index: qtcreator/src/qtcreatorplugin.pri
target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
Index: qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
===================================================================
---- qtcreator.orig/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2015-06-25 01:14:15.299679763 -0500
-+++ qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2015-06-25 01:14:15.295679819 -0500
+--- qtcreator.orig/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2015-08-19 16:22:52.188356358 -0500
++++ qtcreator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 2015-08-19 16:22:52.184356405 -0500
@@ -13,7 +13,7 @@
IDE_LIBRARY_BASENAME = lib
}
diff --git a/debian/patches/series b/debian/patches/series
index b866d0b..15612f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
02_use_x-terminal-emulator.diff
rpath_nonlinux.diff
-qt_versions_trough_qtchooser.patch
# Debian patches.
botan_system_lib.diff
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list