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 | |
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')
-rw-r--r-- | src/corelib/configure.json | 1 | ||||
-rw-r--r-- | src/corelib/global/global.pri | 6 | ||||
-rw-r--r-- | src/gui/configure.json | 3 | ||||
-rw-r--r-- | src/platformsupport/input/evdevtouch/evdevtouch.pri | 3 | ||||
-rw-r--r-- | src/plugins/bearer/connman/connman.pro | 1 | ||||
-rw-r--r-- | src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro | 3 | ||||
-rw-r--r-- | src/plugins/platforms/mirclient/mirclient.pro | 3 |
7 files changed, 4 insertions, 16 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 } diff --git a/src/gui/configure.json b/src/gui/configure.json index b361679101..f4e2faf08b 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -165,7 +165,6 @@ }, "mirclient": { "label": "Mir client libraries", - "export": "", "test": "qpa/mirclient", "sources": [ { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api" } @@ -173,7 +172,6 @@ }, "mtdev": { "label": "mtdev", - "export": "", "test": "unix/mtdev", "sources": [ { "type": "pkgConfig", "args": "mtdev" } @@ -204,7 +202,6 @@ }, "wayland_server": { "label": "Wayland Server", - "export": "", "test": "qpa/wayland-server", "sources": [ { "type": "pkgConfig", "args": "wayland-server" } diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri index 58fafcd8f9..0ad236e882 100644 --- a/src/platformsupport/input/evdevtouch/evdevtouch.pri +++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri @@ -12,6 +12,5 @@ qtConfig(libudev): \ QMAKE_USE_PRIVATE += libudev qtConfig(mtdev) { - CONFIG += link_pkgconfig - PKGCONFIG_PRIVATE += mtdev + QMAKE_USE_PRIVATE += mtdev } diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index 9f3fff304b..065ed11dad 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/src/plugins/bearer/connman/connman.pro @@ -1,7 +1,6 @@ TARGET = qconnmanbearer QT = core network-private dbus -CONFIG += link_pkgconfig HEADERS += qconnmanservice_linux_p.h \ ../linux_common/qofonoservice_linux_p.h \ diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro index f934fd85ed..065a103376 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro @@ -14,8 +14,7 @@ HEADERS += $$PWD/qeglfsvivwlintegration.h OTHER_FILES += $$PWD/eglfs_viv_wl.json -CONFIG += link_pkgconfig -PKGCONFIG_PRIVATE += wayland-server +QMAKE_USE_PRIVATE += wayland_server PLUGIN_TYPE = egldeviceintegrations PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro index 623f7bf97b..0ba63601a9 100644 --- a/src/plugins/platforms/mirclient/mirclient.pro +++ b/src/plugins/platforms/mirclient/mirclient.pro @@ -10,8 +10,7 @@ DEFINES += MESA_EGL_NO_X11_HEADERS QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined -CONFIG += link_pkgconfig -PKGCONFIG += egl mirclient ubuntu-platform-api +QMAKE_USE_PRIVATE += mirclient SOURCES = \ qmirclientbackingstore.cpp \ |