Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

[Building] Include defines.pri after Qt modules are added

Browse Source 
Fixes regression from 74883f8af4
Closes #1253
This commit is contained in:
nowrep 2014-03-05 19:00:53 +01:00
parent 74883f8af4
commit c0311d7ee8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/defines.pri
View File

@ -36,15 +36,18 @@ mac: DEFINES *= DISABLE_DBUS
isEqual(QT_MAJOR_VERSION, 5) {
greaterThan(QTWEBKIT_VERSION_MAJOR, 4) {
# There is one Qt5WebKitWidgets version now, which has same features as QtWebKit 2.3
DEFINES *= USE_QTWEBKIT_2_2 USE_QTWEBKIT_2_3
}
}
else { # Qt 4
greaterThan(QTWEBKIT_VERSION_MAJOR, 3):greaterThan(QTWEBKIT_VERSION_MINOR, 8) {
equals(QTWEBKIT_VERSION_MAJOR, 4):greaterThan(QTWEBKIT_VERSION_MINOR, 8) {
# 4.9.x = QtWebKit 2.2
DEFINES *= USE_QTWEBKIT_2_2
}
greaterThan(QTWEBKIT_VERSION_MAJOR, 3):greaterThan(QTWEBKIT_VERSION_MINOR, 9) {
equals(QTWEBKIT_VERSION_MAJOR, 4):greaterThan(QTWEBKIT_VERSION_MINOR, 9) {
# 4.10.x = QtWebKit 2.3
DEFINES *= USE_QTWEBKIT_2_3
}
}

3
src/lib/lib.pro
View File

@ -1,5 +1,3 @@
include(../defines.pri)
isEqual(QT_MAJOR_VERSION, 5) {
QT += webkitwidgets network widgets printsupport sql script gui-private
} else {
@ -11,6 +9,7 @@ TEMPLATE = lib
DEFINES *= QUPZILLA_SHAREDLIBRARY
include(../defines.pri)
include(3rdparty/qtsingleapplication.pri)
include(../../translations/translations.pri)
include(plugins/qtwebkit/qtwebkit-plugins.pri)