diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-27 11:46:00 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-08-23 23:12:49 (GMT) |
| commit | 08f7ae57fe51ad01cd5bef2ddeb92ea1556218e9 (patch) | |
| tree | cad5a60d7003c912ad4b46d92fc5c933ce51e3b5 | |
| parent | 1bb64da35315e8c8b59d4cdb9dbae234cb2bcf8c (diff) | |
| download | Qt-08f7ae57fe51ad01cd5bef2ddeb92ea1556218e9.zip Qt-08f7ae57fe51ad01cd5bef2ddeb92ea1556218e9.tar.gz Qt-08f7ae57fe51ad01cd5bef2ddeb92ea1556218e9.tar.bz2 | |
Make it possible again to build Qt without webkit
Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt,
because it is only meaningful for separate builds of WebKit.
(Real fix is in the import script that takes care of always
removing that line)
Task-number: QTBUG-12456
Discussed-with: axis
(cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5)
| -rw-r--r-- | mkspecs/modules/qt_webkit_version.pri | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri index d8cf06c..ffd192c 100644 --- a/mkspecs/modules/qt_webkit_version.pri +++ b/mkspecs/modules/qt_webkit_version.pri @@ -2,4 +2,3 @@ QT_WEBKIT_VERSION = 4.7.0 QT_WEBKIT_MAJOR_VERSION = 4 QT_WEBKIT_MINOR_VERSION = 7 QT_WEBKIT_PATCH_VERSION = 0 -QT_CONFIG *= webkit |