diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-17 16:59:51 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-23 11:54:03 (GMT) |
| commit | b5b6cbb477b50c582d545b0e5e3a04626834e7e2 (patch) | |
| tree | 842f52d4b8ad03303ee56b2b1a24f5a765c03f3d /mkspecs | |
| parent | 82d5f0ae622d2579b925a5f6a8054eeeccb9a233 (diff) | |
| download | Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.zip Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.tar.gz Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.tar.bz2 | |
let WebKit inject itself into the qt configuration
i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.
Task-number: QTBUG-12379
Reviewed-by: Simon Hausmann
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/modules/README | 3 | ||||
| -rw-r--r-- | mkspecs/modules/qt_webkit_version.pri | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/modules/README b/mkspecs/modules/README new file mode 100644 index 0000000..f095982 --- /dev/null +++ b/mkspecs/modules/README @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index ffd192c..0000000 --- a/mkspecs/modules/qt_webkit_version.pri +++ /dev/null @@ -1,4 +0,0 @@ -QT_WEBKIT_VERSION = 4.7.0 -QT_WEBKIT_MAJOR_VERSION = 4 -QT_WEBKIT_MINOR_VERSION = 7 -QT_WEBKIT_PATCH_VERSION = 0 |