mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-31 21:13:23 +00:00
Make qmake work for Qt5 on Mac
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:
parent
42bd55877b
commit
6a3dfcaaa7
2 changed files with 2 additions and 1 deletions
|
@ -156,7 +156,7 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
|
|||
!isEmpty(LIBMARBLEDEVEL) {
|
||||
# find it next to our sources
|
||||
INCLUDEPATH += $$LIBMARBLEDEVEL/include
|
||||
LIBS += -L$$LIBMARBLEDEVEL/lib
|
||||
LIBS += -L$$LIBMARBLEDEVEL/src/lib/marble
|
||||
}
|
||||
!contains(DEFINES, NO_MARBLE) {
|
||||
win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
|
||||
|
|
|
@ -2,6 +2,7 @@ CODECFORTR = UTF-8
|
|||
CODECFORSRC = UTF-8
|
||||
include(subsurface-configure.pri)
|
||||
|
||||
QT_CONFIG -= no-pkg-config
|
||||
QT = core gui network svg
|
||||
lessThan(QT_MAJOR_VERSION, 5) {
|
||||
QT += webkit
|
||||
|
|
Loading…
Add table
Reference in a new issue