diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2014-12-25 23:37:36 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-26 08:35:41 -0800 |
| commit | 6a3dfcaaa7f80322d23f173105a93c220cfe5a5a (patch) | |
| tree | dc76c35bc45c3447f487b1755acf198a0ab5eaee | |
| parent | 42bd55877b844caf16c5c7c9a2e49ae67aa15fa5 (diff) | |
| download | subsurface-6a3dfcaaa7f80322d23f173105a93c220cfe5a5a.tar.gz | |
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>
| -rw-r--r-- | subsurface-configure.pri | 2 | ||||
| -rw-r--r-- | subsurface.pro | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index d2092d3ac..05bfbb0f5 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 fb0d9b7e4..02a416e88 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 |