From 49e0cef7654670f7df0f0cfda550d253698cfebd Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 20 Sep 2017 07:18:59 +0200 Subject: [PATCH 1/5] ProjectExplorer: Fix build with namespaced Qt Broke with b6e12f4a. Change-Id: I81af93bfe19801805fd558e3445cd9788f2574b3 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/projectmacro.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/projectmacro.h b/src/plugins/projectexplorer/projectmacro.h index 9489b54d809..2a4537aaf89 100644 --- a/src/plugins/projectexplorer/projectmacro.h +++ b/src/plugins/projectexplorer/projectmacro.h @@ -87,7 +87,7 @@ private: inline uint qHash(const Macro ¯o) { - using ::qHash; + using QT_PREPEND_NAMESPACE(qHash); return qHash(macro.key) ^ qHash(macro.value) ^ qHash(int(macro.type)); } From 357c27e6515952a7351cd23e46fd4b943e12999a Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 21 Sep 2017 16:24:44 +0200 Subject: [PATCH 2/5] Project: Make subscribeSignal handle signals with Parameters Change-Id: Ic685da344f7bdf201daf9156ce48c87ced04e023 Reviewed-by: Tim Jenssen --- src/plugins/projectexplorer/project.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index aac69ab22c8..9329fc3c437 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -169,8 +169,8 @@ public: bool isParsing() const; bool hasParsingData() const; - template - void subscribeSignal(void (S::*sig)(), R*recv, T (R::*sl)()) { + template + void subscribeSignal(void (S::*sig)(Args1...), R*recv, T (R::*sl)(Args2...)) { new Internal::ProjectSubscription([sig, recv, sl, this](ProjectConfiguration *pc) { if (S* sender = qobject_cast(pc)) return connect(sender, sig, recv, sl); @@ -178,8 +178,8 @@ public: }, recv, this); } - template - void subscribeSignal(void (S::*sig)(), R*recv, T sl) { + template + void subscribeSignal(void (S::*sig)(Args1...), R*recv, T sl) { new Internal::ProjectSubscription([sig, recv, sl, this](ProjectConfiguration *pc) { if (S* sender = qobject_cast(pc)) return connect(sender, sig, recv, sl); From 0c1bb6d913c698ec9661b23227066ab284ccc099 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Sep 2017 11:33:49 +0200 Subject: [PATCH 3/5] VcsBaseClientSettings: Skip empty parts when splitting paths Change-Id: I56106079a31ec0ebc64a038ca41df618b0c09fcf Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbaseclientsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index f87daf18017..ab31348c1a1 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -363,7 +363,7 @@ Utils::FileName VcsBaseClientSettings::binaryPath() const QStringList VcsBaseClientSettings::searchPathList() const { - return stringValue(pathKey).split(Utils::HostOsInfo::pathListSeparator()); + return stringValue(pathKey).split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); } QString VcsBaseClientSettings::settingsGroup() const From ede5e0c586503caa002e82f952178dbf58a40195 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Sep 2017 12:19:14 +0200 Subject: [PATCH 4/5] Environment::value(): Use findKey() helper Also change path() to use value() so that "Path" as used on Windows will be found as well. Task-number: QTCREATORBUG-18958 Change-Id: Ie930f6a6e71c76459cf9d089c225f5b1adf52433 Reviewed-by: Eike Ziller --- src/libs/utils/environment.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 0d312d8b8db..1aee1cf908e 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -454,13 +454,14 @@ FileName Environment::searchInPath(const QString &executable, QStringList Environment::path() const { - return m_values.value("PATH") + return value("PATH") .split(OsSpecificAspects(m_osType).pathListSeparator(), QString::SkipEmptyParts); } QString Environment::value(const QString &key) const { - return m_values.value(key); + const auto it = findKey(m_values, m_osType, key); + return it != m_values.end() ? it.value() : QString(); } QString Environment::key(Environment::const_iterator it) const From 631718bfba9b40d7e97514d63375dc9af4a11a34 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 25 Sep 2017 15:20:35 +0200 Subject: [PATCH 5/5] ClearCase: Clean forward declaration Change-Id: I1b54d3e4eeeb301c0ce06086b5f14d2efc510525 Reviewed-by: Orgad Shaneh --- src/plugins/clearcase/clearcaseplugin.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index 70c18334263..6aeacf68657 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -40,8 +40,6 @@ QT_BEGIN_NAMESPACE class QAction; -class QComboBox; -class QDir; template class QFutureInterface; class QMutex;