diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 22:29:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 22:29:46 (GMT) |
| commit | 2868302626b8a31f44df1068514485a89ec27171 (patch) | |
| tree | 634e63aa3ee695b91c9cd4a7349f587c6e50c80f | |
| parent | 130304d09ee205ade1654839b78bd27792407048 (diff) | |
| parent | ae5f7005c709165f847445aca746b5b338341121 (diff) | |
| download | Qt-2868302626b8a31f44df1068514485a89ec27171.zip Qt-2868302626b8a31f44df1068514485a89ec27171.tar.gz Qt-2868302626b8a31f44df1068514485a89ec27171.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Unbreak configure.exe
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 391bcf8..6c12cc2 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2131,7 +2131,7 @@ bool Configure::checkAvailability(const QString &part) available = findFile("BuildConsole.exe") && findFile("xgConsole.exe"); else if (part == "XMLPATTERNS") available = dictionary.value("EXCEPTIONS") == "yes"; - } else if (part == "PHONON") { + else if (part == "PHONON") { if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) { available = true; } else { |