From 90f51d2998107c76ed08cec0ba437c0af6adc30f Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Thu, 25 Dec 2014 23:37:36 +0100 Subject: [PATCH 1/2] Make qmake work for Qt5 on Mac Set special build marble path properly and enable pkg-config Signed-off-by: Robert C. Helling --- subsurface-configure.pri | 2 +- subsurface.pro | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/subsurface-configure.pri b/subsurface-configure.pri index d2092d3..05bfbb0 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -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 diff --git a/subsurface.pro b/subsurface.pro index 7d36f1c..04349c7 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -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 -- 1.9.3 (Apple Git-50)