diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-16 11:52:15 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-16 11:52:15 (GMT) |
| commit | 15e2b2d753250bbe01a78d9ece37f0f0b08cd21c (patch) | |
| tree | a37bb70124fdbecbbaf7e0e2a141a359eaf4f412 /tools/configure/configureapp.cpp | |
| parent | 3328e0ee94b94c83fe9d64f741bede6725f5c952 (diff) | |
| parent | 7fdfa58b958b658feb7b20dd7a7322d235fe4bea (diff) | |
| download | Qt-15e2b2d753250bbe01a78d9ece37f0f0b08cd21c.zip Qt-15e2b2d753250bbe01a78d9ece37f0f0b08cd21c.tar.gz Qt-15e2b2d753250bbe01a78d9ece37f0f0b08cd21c.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e2b7d58..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") @@ -3103,7 +3107,7 @@ void Configure::generateConfigfiles() if (tmpFile3.open()) { tmpStream.setDevice(&tmpFile3); tmpStream << "/* Evaluation license key */" << endl - << "static const char qt_eval_key_data [512 + 12] = \"" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl; + << "static const char qt_eval_key_data [512 + 12] = \"qt_qevalkey=" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl; tmpStream.flush(); tmpFile3.flush(); |