feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Creator Examples: prioritize default Qt version when searching examples

Browse Source 
Change-Id: Id287332535494dd51609178d429d58749b0c28d6
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christiaan Janssen
2012-11-22 14:30:29 +01:00
committed by hjk
parent d0f3d7cb89
commit a990796070
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -41,6 +41,8 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <projectexplorer/kitmanager.h>
#include <qtsupport/qtkitinformation.h>
#include <algorithm> #include <algorithm>
using QtSupport::QtVersionManager; using QtSupport::QtVersionManager;
@@ -344,9 +346,15 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString
QString potentialSourceFallback; QString potentialSourceFallback;
const QStringList pattern(QLatin1String("*.xml")); const QStringList pattern(QLatin1String("*.xml"));
// prioritize default qt version
QtVersionManager *versionManager = QtVersionManager::instance(); 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 // qt5 with examples OR demos manifest
if (version->qtVersion().majorVersion == 5 && (version->hasExamples() || version->hasDemos())) { if (version->qtVersion().majorVersion == 5 && (version->hasExamples() || version->hasDemos())) {
// examples directory in Qt5 is under the qtbase submodule, // examples directory in Qt5 is under the qtbase submodule,
@@ -367,9 +375,7 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString
return sources; return sources;
} }
} }
}
foreach (BaseQtVersion *version, versionManager->validVersions()) {
QFileInfoList fis; QFileInfoList fis;
if (version->hasExamples()) if (version->hasExamples())
fis << QDir(version->examplesPath()).entryInfoList(pattern); fis << QDir(version->examplesPath()).entryInfoList(pattern);