diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-23 07:56:42 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-23 07:57:58 (GMT) |
| commit | 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113 (patch) | |
| tree | d5ff265350a3b48e124bff4a1d384c97e427fbd9 /tools | |
| parent | 6cef89c6442d06934c3545919e6b8283b3d8d1a4 (diff) | |
| download | Qt-4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.zip Qt-4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.tar.gz Qt-4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.tar.bz2 | |
Removed support for static linking of QtWebKit.
Static linking of WebKit is not going to be supported anymore in Qt 4.7,
so this commit makes sure it's mentioned in the documentation and that
configure disables WebKit if static linking of Qt is requested.
Reviewed-by: Andy Shaw <qt-info@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 2e2d8ba..c66eb53 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2125,6 +2125,11 @@ 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-msvc2010") || (dictionary.value("QMAKESPEC") == "win32-g++"); + if( dictionary[ "SHARED" ] == "no" ) { + cout << endl << "WARNING: Using static linking will disable the WebKit module." << endl + << endl; + available = false; + } } else if (part == "AUDIO_BACKEND") { available = true; if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) { |