diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 08:07:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 08:07:35 (GMT) |
| commit | be04377b22475772e376a51017855a00cc732e80 (patch) | |
| tree | 0e692911fc3a0f9dac54289778236abcc2c7904b /mkspecs/features/symbian/qt.prf | |
| parent | c12af169a157a5ba2e25289b996648a9a8e3cb9f (diff) | |
| parent | 6c5d190923fb23e2f644e71ac2393c25619848c8 (diff) | |
| download | Qt-be04377b22475772e376a51017855a00cc732e80.zip Qt-be04377b22475772e376a51017855a00cc732e80.tar.gz Qt-be04377b22475772e376a51017855a00cc732e80.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
My 4.6.3 changes.
Added my 4.6.3 changes.
My 4.6.3 changes.
Add my 4.6.3 changes
Fix WebKit version dependency in pkg files
Add support for including module specific .pri files as part of qt.prf handling
My changelog entries for 4.6.3
Add my changes to the 4.6.3 changes log
my changelog for 4.6.3
Switch Symbian^3 QCursor implementation back to 5.0 way
fix qmake -project once more
Diffstat (limited to 'mkspecs/features/symbian/qt.prf')
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 9fc9814..b5d3d98 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -31,9 +31,16 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0 # Projects linking to webkit need dependency to webkit contains(QT, webkit): { + # these can be overridden by mkspecs/modules/qt_webkit.pri + isEmpty(QT_WEBKIT_MAJOR_VERSION) { + QT_WEBKIT_MAJOR_VERSION = $${QT_MAJOR_VERSION} + QT_WEBKIT_MINOR_VERSION = $${QT_MINOR_VERSION} + QT_WEBKIT_PATCH_VERSION = $${QT_PATCH_VERSION} + } + pkg_depends_webkit += \ "; Dependency to Qt Webkit" \ - "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" + "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION}, {\"QtWebKit\"}" } else { default_deployment.pkg_prerules -= pkg_depends_webkit } |