diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-21 06:15:04 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-21 06:15:04 (GMT) |
| commit | 6c5d190923fb23e2f644e71ac2393c25619848c8 (patch) | |
| tree | 78cf279084269f88dff58c4bc0ab33f2aa882866 /mkspecs/features/symbian | |
| parent | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (diff) | |
| parent | db87996d4ca90f8fffb5a8e012fa7f2336c038b0 (diff) | |
| download | Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.zip Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.tar.gz Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Diffstat (limited to 'mkspecs/features/symbian')
| -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 } |