diff options
| author | Espen Riskedal <espenr@trolltech.com> | 2009-09-29 12:10:46 (GMT) |
|---|---|---|
| committer | Espen Riskedal <espenr@trolltech.com> | 2009-09-29 12:10:46 (GMT) |
| commit | 63be458a64d6f88333cd921e587b2c651acb122f (patch) | |
| tree | 5097bec0ba01a3f65a539a9ef805fd551cef88ad | |
| parent | e128abf27b5668bfce7ac471ed283d1fba007499 (diff) | |
| parent | 950f80620b56e9ed277240dc16087f3e4b53cc4a (diff) | |
| download | Qt-63be458a64d6f88333cd921e587b2c651acb122f.zip Qt-63be458a64d6f88333cd921e587b2c651acb122f.tar.gz Qt-63be458a64d6f88333cd921e587b2c651acb122f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 48d9370..b9f8ed8 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2025,9 +2025,9 @@ bool Configure::checkAvailability(const QString &part) if (!findFile("msdmo.lib")) cout << "msdmo.lib not found" << endl; if (!findFile("d3d9.h")) cout << "d3d9.h not found" << endl; } - } else if (part == "MULTIMEDIA") { + } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS") { available = true; - } else if (part == "WEBKIT" || part == "SCRIPT" || part == "SCRIPTTOOLS") { + } else if (part == "WEBKIT") { available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++"); } |