AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace PKGCONFIG+=foo usages with QMAKE_USE

Browse Source 
replace explicit pkg-config uses with the results of configure tests,
for consistency.

Change-Id: I3587db6085798ea7a49f8871fc6838eb687a6391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Lars Knoll 2016-10-25 15:22:01 +02:00
parent c70d77dc76
commit 04f0a69e96
7 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/configure.json
View File

@ -61,7 +61,6 @@
"journald": { "journald": {
"label": "journald", "label": "journald",
"test": "unix/journald", "test": "unix/journald",
"export": "",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "libsystemd" }, { "type": "pkgConfig", "args": "libsystemd" },
{ "type": "pkgConfig", "args": "libsystemd-journal" } { "type": "pkgConfig", "args": "libsystemd-journal" }

6
src/corelib/global/global.pri
View File

@ -53,11 +53,7 @@ slog2 {
} }
journald { journald {
CONFIG += link_pkgconfig QMAKE_USE_PRIVATE += journald
packagesExist(libsystemd): \
PKGCONFIG_PRIVATE += libsystemd
else: \
PKGCONFIG_PRIVATE += libsystemd-journal
DEFINES += QT_USE_JOURNALD DEFINES += QT_USE_JOURNALD
} }

3
src/gui/configure.json
View File

@ -165,7 +165,6 @@
}, },
"mirclient": { "mirclient": {
"label": "Mir client libraries", "label": "Mir client libraries",
"export": "",
"test": "qpa/mirclient", "test": "qpa/mirclient",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api" } { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api" }
@ -173,7 +172,6 @@
}, },
"mtdev": { "mtdev": {
"label": "mtdev", "label": "mtdev",
"export": "",
"test": "unix/mtdev", "test": "unix/mtdev",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "mtdev" } { "type": "pkgConfig", "args": "mtdev" }
@ -204,7 +202,6 @@
}, },
"wayland_server": { "wayland_server": {
"label": "Wayland Server", "label": "Wayland Server",
"export": "",
"test": "qpa/wayland-server", "test": "qpa/wayland-server",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "wayland-server" } { "type": "pkgConfig", "args": "wayland-server" }

3
src/platformsupport/input/evdevtouch/evdevtouch.pri
View File

@ -12,6 +12,5 @@ qtConfig(libudev): \
QMAKE_USE_PRIVATE += libudev QMAKE_USE_PRIVATE += libudev
qtConfig(mtdev) { qtConfig(mtdev) {
CONFIG += link_pkgconfig QMAKE_USE_PRIVATE += mtdev
PKGCONFIG_PRIVATE += mtdev
} }

1
src/plugins/bearer/connman/connman.pro
View File

@ -1,7 +1,6 @@
TARGET = qconnmanbearer TARGET = qconnmanbearer
QT = core network-private dbus QT = core network-private dbus
CONFIG += link_pkgconfig
HEADERS += qconnmanservice_linux_p.h \ HEADERS += qconnmanservice_linux_p.h \
../linux_common/qofonoservice_linux_p.h \ ../linux_common/qofonoservice_linux_p.h \

3
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro
View File

@ -14,8 +14,7 @@ HEADERS += $$PWD/qeglfsvivwlintegration.h
OTHER_FILES += $$PWD/eglfs_viv_wl.json OTHER_FILES += $$PWD/eglfs_viv_wl.json
CONFIG += link_pkgconfig QMAKE_USE_PRIVATE += wayland_server
PKGCONFIG_PRIVATE += wayland-server
PLUGIN_TYPE = egldeviceintegrations PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin

3
src/plugins/platforms/mirclient/mirclient.pro
View File

@ -10,8 +10,7 @@ DEFINES += MESA_EGL_NO_X11_HEADERS
QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
CONFIG += link_pkgconfig QMAKE_USE_PRIVATE += mirclient
PKGCONFIG += egl mirclient ubuntu-platform-api
SOURCES = \ SOURCES = \
qmirclientbackingstore.cpp \ qmirclientbackingstore.cpp \