mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-08 00:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make qmake work for Qt5 on Mac

Browse source 
Set special build marble path properly and enable pkg-config

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2014-12-25 23:37:36 +01:00 • committed by Dirk Hohndel
parent 42bd55877b
commit 6a3dfcaaa7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subsurface-configure.pri
View file

@ -156,7 +156,7 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
!isEmpty(LIBMARBLEDEVEL) { !isEmpty(LIBMARBLEDEVEL) {
# find it next to our sources # find it next to our sources
INCLUDEPATH += $$LIBMARBLEDEVEL/include INCLUDEPATH += $$LIBMARBLEDEVEL/include
LIBS += -L$$LIBMARBLEDEVEL/lib LIBS += -L$$LIBMARBLEDEVEL/src/lib/marble
} }
!contains(DEFINES, NO_MARBLE) { !contains(DEFINES, NO_MARBLE) {
win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd

1
subsurface.pro
View file

@ -2,6 +2,7 @@ CODECFORTR = UTF-8
CODECFORSRC = UTF-8 CODECFORSRC = UTF-8
include(subsurface-configure.pri) include(subsurface-configure.pri)
QT_CONFIG -= no-pkg-config
QT = core gui network svg QT = core gui network svg
lessThan(QT_MAJOR_VERSION, 5) { lessThan(QT_MAJOR_VERSION, 5) {
QT += webkit QT += webkit