diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-20 09:01:46 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-20 09:47:12 (GMT) |
| commit | 894cbac989cada9d54bc65e4d8cb22682ff50ad9 (patch) | |
| tree | a5c45d91f204710b8612d339f3f9df35959bfce3 /mkspecs/features | |
| parent | c56724f49367faafee54aa691c47fa07d6a041eb (diff) | |
| download | Qt-894cbac989cada9d54bc65e4d8cb22682ff50ad9.zip Qt-894cbac989cada9d54bc65e4d8cb22682ff50ad9.tar.gz Qt-894cbac989cada9d54bc65e4d8cb22682ff50ad9.tar.bz2 | |
Fix WebKit version dependency in pkg files
Default to the Qt major/minor/patch version for WebKit, but use them
only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is
read by qt.prf
Task-number: QTBUG-10847
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
Diffstat (limited to 'mkspecs/features')
| -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 b2156a9..e27ffc6 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 } |