summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-09-29 13:55:41 +0200
committerKent Hansen <khansen@trolltech.com>2009-09-29 13:56:43 +0200
commit950f80620b56e9ed277240dc16087f3e4b53cc4a (patch)
treeb1a4e202dbb588cdeff68bf05d0fa28f888f1b54 /tools
parent0140f76b4238f69e0b8886fca24b4afef33f106f (diff)
Enable QtScript by default on Windows
Reviewed-by: Simon Hausmann
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 48d9370d6f..b9f8ed8662 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++");
}