diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-14 10:13:59 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-14 10:13:59 (GMT) |
| commit | 61c303e8bab04312c17ad2ee03e9ba3f29a0184b (patch) | |
| tree | 5ed7aec0f1849801c87b38a9851a7215cefc6600 /tools | |
| parent | c338f602b51a2a4307680355f855b5f2cf9d0b92 (diff) | |
| parent | 69e53a801b93797a7398415d681c6e1c428d3a1c (diff) | |
| download | Qt-61c303e8bab04312c17ad2ee03e9ba3f29a0184b.zip Qt-61c303e8bab04312c17ad2ee03e9ba3f29a0184b.tar.gz Qt-61c303e8bab04312c17ad2ee03e9ba3f29a0184b.tar.bz2 | |
Merge branch 'qtscript-jsc-backend-configure' of git@scm.dev.nokia.troll.no:qt/qt-webkit into qtscript-jsc-backend
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 20fe421..62192b6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1883,10 +1883,8 @@ bool Configure::checkAvailability(const QString &part) } } else if (part == "MULTIMEDIA") { available = true; - } else if (part == "WEBKIT") { + } else if (part == "WEBKIT" || part == "SCRIPT" || part == "SCRIPTTOOLS") { available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++"); - } else if (part == "SCRIPT" || part == "SCRIPTTOOLS") { - available = true; } return available; |