diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-03-07 02:05:32 +0200 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2013-04-03 00:15:32 +0200 |
| commit | 2b2ac7a69720e8087655847381dfd6656e0429ac (patch) | |
| tree | b70b212b78a0b5f738091475888bb2eb6739f952 | |
| parent | c4a36f94bd50d0236aaa7bddbe72bc7e0fbdac4f (diff) | |
use pkgconfig on platforms that support it.
reinventing the wheel is not nice, and at least for me, completely broken on OS X.
Change-Id: I16721b669ecdd7dfca1c7bfb9ebd034d67849a8a
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| -rw-r--r-- | src/messaging/messaging.pro | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/messaging/messaging.pro b/src/messaging/messaging.pro index db13ca1653..6f4687e623 100644 --- a/src/messaging/messaging.pro +++ b/src/messaging/messaging.pro @@ -366,27 +366,22 @@ simulator { simulator|contains(qmf_enabled, yes):!maemo6 { DEFINES += USE_QMF_IMPLEMENTATION - - QMF_INCLUDEDIR = $$(QMF_INCLUDEDIR) - QMF_LIBDIR = $$(QMF_LIBDIR) - - # QMF headers must be located at $QMF_INCLUDEDIR - !isEmpty(QMF_INCLUDEDIR): INCLUDEPATH += $$(QMF_INCLUDEDIR) $$(QMF_INCLUDEDIR)/support - # QMF libraries must be located at $QMF_LIBDIR - macx { - !isEmpty(QMF_LIBDIR): QMAKE_LFLAGS += -F$$(QMF_LIBDIR) - LIBS += -framework qmfclient + !windows { + CONFIG += link_pkgconfig + PKGCONFIG += qmfclient } else { + QMF_INCLUDEDIR = $$(QMF_INCLUDEDIR) + QMF_LIBDIR = $$(QMF_LIBDIR) + + # QMF headers must be located at $QMF_INCLUDEDIR + !isEmpty(QMF_INCLUDEDIR): INCLUDEPATH += $$(QMF_INCLUDEDIR) $$(QMF_INCLUDEDIR)/support + + # QMF libraries must be located at $QMF_LIBDIR !isEmpty(QMF_LIBDIR): LIBS += -L$$(QMF_LIBDIR) - LIBS += -l$$qtLibraryTarget(qmfclient) - } - - # QMF libraries must be located at $QMF_LIBDIR - mac { - QMAKE_LFLAGS += -F$$(QMF_LIBDIR) - LIBS += -framework qmfclient - } else { + LIBS += -l$$qtLibraryTarget(qmfclient) + + # QMF libraries must be located at $QMF_LIBDIR LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qmfclient) } |