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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
This commit is contained in:
Oswald Buddenhagen
2010-11-01 12:11:03 +01:00
parent 4293ee40ec 36c00b4344
commit a9ff4d3749
39 changed files with 930 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -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()) {