summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-09-08 02:27:43 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-09-08 02:27:43 (GMT)
commitc4bf6792f6ffd551785b96d44f31d21543fe338e (patch)
treeca846e12f54633b848803a2ce16a1021c674d9e9 /mkspecs
parent4283bd37c6367c519b4d5f2640417f805e7f3196 (diff)
downloadQt-c4bf6792f6ffd551785b96d44f31d21543fe338e.zip
Qt-c4bf6792f6ffd551785b96d44f31d21543fe338e.tar.gz
Qt-c4bf6792f6ffd551785b96d44f31d21543fe338e.tar.bz2
Revert "let WebKit inject itself into the qt configuration"
This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/modules/README3
-rw-r--r--mkspecs/modules/qt_webkit_version.pri4
2 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/modules/README b/mkspecs/modules/README
deleted file mode 100644
index f095982..0000000
--- a/mkspecs/modules/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Externally provided Qt modules may drop a qmake file here to become part of
-the current Qt configuration. The file name must follow the pattern
-"qt_<module>.pri". It must contain a "QT_CONFIG += <module>" statement.
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri
new file mode 100644
index 0000000..ffd192c
--- /dev/null
+++ b/mkspecs/modules/qt_webkit_version.pri
@@ -0,0 +1,4 @@
+QT_WEBKIT_VERSION = 4.7.0
+QT_WEBKIT_MAJOR_VERSION = 4
+QT_WEBKIT_MINOR_VERSION = 7
+QT_WEBKIT_PATCH_VERSION = 0