diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-25 15:22:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 13:07:34 +0000 |
| commit | 04f0a69e96fca03c18e0c7eaaab7babc49e35198 (patch) | |
| tree | 2603418de2d2797c50018b7e7612e6b0247cf455 /src/corelib | |
| parent | c70d77dc766c9372a689035038420fb414e49b48 (diff) | |
Replace PKGCONFIG+=foo usages with QMAKE_USE
replace explicit pkg-config uses with the results of configure tests,
for consistency.
Change-Id: I3587db6085798ea7a49f8871fc6838eb687a6391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/configure.json | 1 | ||||
| -rw-r--r-- | src/corelib/global/global.pri | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index fbbbef4f21..e7eb5fe482 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -61,7 +61,6 @@ "journald": { "label": "journald", "test": "unix/journald", - "export": "", "sources": [ { "type": "pkgConfig", "args": "libsystemd" }, { "type": "pkgConfig", "args": "libsystemd-journal" } diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 6a8948822c..f74662b464 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -53,11 +53,7 @@ slog2 { } journald { - CONFIG += link_pkgconfig - packagesExist(libsystemd): \ - PKGCONFIG_PRIVATE += libsystemd - else: \ - PKGCONFIG_PRIVATE += libsystemd-journal + QMAKE_USE_PRIVATE += journald DEFINES += QT_USE_JOURNALD } |