diff options
author | Christiaan Janssen <christiaan.janssen@digia.com> | 2012-11-22 14:30:29 +0100 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2012-11-22 14:40:57 +0100 |
commit | a9907960705572cff736585b3b04ca5d5932daca (patch) | |
tree | b398b1f28ec3c8d4738e19e8ca3d7b2d2ef3b062 /src/plugins/qtsupport/exampleslistmodel.cpp | |
parent | d0f3d7cb89a234f88b06bc19a41e50c41b1eab0a (diff) | |
download | qt-creator-a9907960705572cff736585b3b04ca5d5932daca.tar.gz |
Creator Examples: prioritize default Qt version when searching examples
Change-Id: Id287332535494dd51609178d429d58749b0c28d6
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/qtsupport/exampleslistmodel.cpp')
-rw-r--r-- | src/plugins/qtsupport/exampleslistmodel.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 859acb271f..b59733efee 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -41,6 +41,8 @@ #include <utils/qtcassert.h> #include <utils/environment.h> +#include <projectexplorer/kitmanager.h> +#include <qtsupport/qtkitinformation.h> #include <algorithm> using QtSupport::QtVersionManager; @@ -344,9 +346,15 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString QString potentialSourceFallback; const QStringList pattern(QLatin1String("*.xml")); + // prioritize default qt version QtVersionManager *versionManager = QtVersionManager::instance(); + QList <BaseQtVersion *> qtVersions = versionManager->validVersions(); + ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::instance()->defaultKit(); + BaseQtVersion *defaultVersion = QtKitInformation::qtVersion(defaultKit); + if (defaultVersion && qtVersions.contains(defaultVersion)) + qtVersions.move(qtVersions.indexOf(defaultVersion), 0); - foreach (BaseQtVersion *version, versionManager->validVersions()) { + foreach (BaseQtVersion *version, qtVersions) { // qt5 with examples OR demos manifest if (version->qtVersion().majorVersion == 5 && (version->hasExamples() || version->hasDemos())) { // examples directory in Qt5 is under the qtbase submodule, @@ -367,9 +375,7 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString return sources; } } - } - foreach (BaseQtVersion *version, versionManager->validVersions()) { QFileInfoList fis; if (version->hasExamples()) fis << QDir(version->examplesPath()).entryInfoList(pattern); |