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

Make preferred version work in all cases

Browse Source 
Reviewed-by: dt
This commit is contained in:
Daniel Molkentin
2010-11-18 15:01:18 +01:00
parent eb63db5c4e
commit 7ea4d2bb7b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,8 +242,15 @@ void QtVersionManager::updateExamples()
} }
// in SDKs, we want to prefer the Qt version shipping with the SDK // in SDKs, we want to prefer the Qt version shipping with the SDK
QString preferred = Core::ICore::instance()->settings()->value("General/PreferredQMakePath").toString(); QSettings *settings = Core::ICore::instance()->settings();
QString preferred = settings->value(QLatin1String("PreferredQMakePath")).toString();
preferred = QDir::fromNativeSeparators(preferred);
if (!preferred.isEmpty()) { if (!preferred.isEmpty()) {
#ifdef Q_OS_WIN
preferred = preferred.toLower();
if (!preferred.endsWith(QLatin1String(".exe")))
preferred.append(QLatin1String(".exe"));
#endif
foreach (version, candidates) { foreach (version, candidates) {
if (version->qmakeCommand() == preferred) { if (version->qmakeCommand() == preferred) {
emit updateExamples(version->examplesPath(), version->demosPath(), version->sourcePath()); emit updateExamples(version->examplesPath(), version->demosPath(), version->sourcePath());