From ac18c37417bc35d7b696a9ffb4aa4505e6941074 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 25 Oct 2010 19:33:35 +0200
Subject: [PATCH] Prefer Qt version to show examples from
Reviewed-by: Niels Weber
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 9b71b4cd0db..a6c4fe94190 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -240,6 +240,17 @@ void QtVersionManager::updateExamples()
candidates.append(version);
}
+ // in SDKs, we want to prefer the Qt version shipping with the SDK
+ QString preferred = Core::ICore::instance()->settings()->value("General/PreferredQMakePath").toString();
+ if (!preferred.isEmpty()) {
+ foreach (version, candidates) {
+ if (version->qmakeCommand() == preferred) {
+ emit updateExamples(version->examplesPath(), version->demosPath(), version->sourcePath());
+ return;
+ }
+ }
+ }
+
// prefer versions with declarative examples
foreach (version, candidates) {
if (QDir(version->examplesPath()+"/declarative").exists()) {
--
GitLab