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

Also allow Qt5 to provide example manifests.

Browse Source 
Change-Id: I71630c7ea8d413949f57797b90672cc3d9b8778f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Eike Ziller
2012-10-22 14:32:29 +02:00
parent f9089c660b
commit 1ac3850c6f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,10 +336,6 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString
QtVersionManager *versionManager = QtVersionManager::instance(); QtVersionManager *versionManager = QtVersionManager::instance();
foreach (BaseQtVersion *version, versionManager->validVersions()) { foreach (BaseQtVersion *version, versionManager->validVersions()) {
// There is no good solution for Qt 5 yet
if (version->qtVersion().majorVersion != 4)
continue;
QFileInfoList fis; QFileInfoList fis;
if (version->hasExamples()) if (version->hasExamples())
fis << QDir(version->examplesPath()).entryInfoList(pattern); fis << QDir(version->examplesPath()).entryInfoList(pattern);
@@ -350,8 +346,9 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString
sources.append(fi.filePath()); sources.append(fi.filePath());
return sources; return sources;
} }
// check if this Qt version would be the preferred fallback
if (version->hasExamples() && version->hasDemos()) { // cached, so no performance hit // check if this Qt version would be the preferred fallback, Qt 4 only
if (version->qtVersion().majorVersion == 4 && version->hasExamples() && version->hasDemos()) { // cached, so no performance hit
bool hasDeclarative = QDir(version->examplesPath() + QLatin1String("/declarative")).exists(); bool hasDeclarative = QDir(version->examplesPath() + QLatin1String("/declarative")).exists();
if (potentialExamplesFallback.isEmpty() if (potentialExamplesFallback.isEmpty()
|| (!potentialFallbackHasDeclarative && hasDeclarative)) { || (!potentialFallbackHasDeclarative && hasDeclarative)) {