29 "; Default dependency to Qt libraries" \ |
29 "; Default dependency to Qt libraries" \ |
30 "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"Qt\"}" |
30 "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"Qt\"}" |
31 |
31 |
32 # Projects linking to webkit need dependency to webkit |
32 # Projects linking to webkit need dependency to webkit |
33 contains(QT, webkit): { |
33 contains(QT, webkit): { |
|
34 # these can be overridden by mkspecs/modules/qt_webkit.pri |
|
35 isEmpty(QT_WEBKIT_MAJOR_VERSION) { |
|
36 QT_WEBKIT_MAJOR_VERSION = $${QT_MAJOR_VERSION} |
|
37 QT_WEBKIT_MINOR_VERSION = $${QT_MINOR_VERSION} |
|
38 QT_WEBKIT_PATCH_VERSION = $${QT_PATCH_VERSION} |
|
39 } |
|
40 |
34 pkg_depends_webkit += \ |
41 pkg_depends_webkit += \ |
35 "; Dependency to Qt Webkit" \ |
42 "; Dependency to Qt Webkit" \ |
36 "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" |
43 "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION}, {\"QtWebKit\"}" |
37 } else { |
44 } else { |
38 default_deployment.pkg_prerules -= pkg_depends_webkit |
45 default_deployment.pkg_prerules -= pkg_depends_webkit |
39 } |
46 } |
40 } else { |
47 } else { |
41 default_deployment.pkg_prerules -= pkg_depends_webkit pkg_depends_qt |
48 default_deployment.pkg_prerules -= pkg_depends_webkit pkg_depends_qt |