diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-05 07:49:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-05 22:41:38 (GMT) |
| commit | ef3141ecb2c10db59c1294ccd1ece1208585b290 (patch) | |
| tree | 6bbfcd06e7288c85dfcc526c3cacd54779b0a79d | |
| parent | ede4591bee8f6e2572f681064de03a327dc66629 (diff) | |
| download | Qt-ef3141ecb2c10db59c1294ccd1ece1208585b290.zip Qt-ef3141ecb2c10db59c1294ccd1ece1208585b290.tar.gz Qt-ef3141ecb2c10db59c1294ccd1ece1208585b290.tar.bz2 | |
Make declarative support in configure.exe auto.
Reviewed-by: Warwick Allison
| -rwxr-xr-x | configure.exe | bin | 1172480 -> 1173504 bytes | |||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 13d0673..7fe4a93 100755 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 95f271d..d8c2abd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -249,7 +249,7 @@ Configure::Configure( int& argc, char** argv ) dictionary[ "MULTIMEDIA" ] = "yes"; dictionary[ "DIRECTSHOW" ] = "no"; dictionary[ "WEBKIT" ] = "auto"; - dictionary[ "DECLARATIVE" ] = "no"; + dictionary[ "DECLARATIVE" ] = "auto"; dictionary[ "PLUGIN_MANIFESTS" ] = "yes"; QString version; @@ -2038,6 +2038,8 @@ bool Configure::checkAvailability(const QString &part) available = true; } else if (part == "WEBKIT") { available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++"); + } else if (part == "DECLARATIVE") { + available = QFile::exists(sourcePath + "/src/declarative/qml/qmlcomponent.h"); } return available; @@ -2124,6 +2126,8 @@ void Configure::autoDetection() dictionary["PHONON"] = checkAvailability("PHONON") ? "yes" : "no"; if (dictionary["WEBKIT"] == "auto") dictionary["WEBKIT"] = checkAvailability("WEBKIT") ? "yes" : "no"; + if (dictionary["DECLARATIVE"] == "auto") + dictionary["DECLARATIVE"] = checkAvailability("DECLARATIVE") ? "yes" : "no"; // Qt/WinCE remote test application if (dictionary["CETEST"] == "auto") |