diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 00:55:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 00:55:13 (GMT) |
| commit | 270beb4f8a5ca801e350d7e52e649fe2bd85022b (patch) | |
| tree | db0ab8a6e431db7870ccc235ec983a7d570ef48b | |
| parent | b65e9811968ec2e122b0e7f6b9a58dce50e3c01c (diff) | |
| parent | 4cd413970b18125885ce60d82a4ad06bce6395a5 (diff) | |
| download | Qt-270beb4f8a5ca801e350d7e52e649fe2bd85022b.zip Qt-270beb4f8a5ca801e350d7e52e649fe2bd85022b.tar.gz Qt-270beb4f8a5ca801e350d7e52e649fe2bd85022b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Make it possible again to build Qt without webkit
| -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 |