summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-01 14:06:00 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-01 14:40:02 (GMT)
commit9ea2eb78e4e3613f052535892a5f3bbf0e8c4dee (patch)
treeed2eaa29c5dfc8735ae9adac29c3e530772736f2
parentf370fa5c6758cdce3c161de94888ed1d05ae2c9f (diff)
downloadQt-9ea2eb78e4e3613f052535892a5f3bbf0e8c4dee.zip
Qt-9ea2eb78e4e3613f052535892a5f3bbf0e8c4dee.tar.gz
Qt-9ea2eb78e4e3613f052535892a5f3bbf0e8c4dee.tar.bz2
Fix versioning of pkg files on Symbian for apps linking against WebKit
Currently features/symbian/qt.prf defaults to the qt version for WebKit when it comes with Qt from src/3rdparty. Instead of defaulting to the Qt version, pick up the real version from src/3rdparty by including the .pri file. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
-rw-r--r--mkspecs/modules/qt_webkit_version.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri
new file mode 100644
index 0000000..0370720
--- /dev/null
+++ b/mkspecs/modules/qt_webkit_version.pri
@@ -0,0 +1,2 @@
+# The version information comes from our copy of
+include($$PWD/../../src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri)