diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-20 23:07:46 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-07 16:18:03 +0000 |
commit | da95152dfb968d815f898f3d190988a915f49142 (patch) | |
tree | f0e9a556385fd807f31cd3d8d395c512cb160dd3 /src/dbus/dbus.pro | |
parent | 921e5193cd38cae307f9fa0b314e6f1649962c73 (diff) |
Unify naming of LIBS/CFLAGS for 3rd party libraries
Most libs use QMAKE_LIBS/CFLAGS, but some have other naming
conventions. Unify them into using QMAKE_LIBS/CFLAGS.
Change-Id: I39b188adc1f9a223a83b294c5315c3095a9c68de
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/dbus/dbus.pro')
-rw-r--r-- | src/dbus/dbus.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 4c1aec7bb3..445ff48482 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -3,15 +3,15 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -!contains(QT_LIBS_DBUS, .*dbus-1.*) { - win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d - else:QT_LIBS_DBUS += -ldbus-1 +!contains(QMAKE_LIBS_DBUS, .*dbus-1.*) { + win32:CONFIG(debug, debug|release):QMAKE_LIBS_DBUS += -ldbus-1d + else:QMAKE_LIBS_DBUS += -ldbus-1 } DEFINES += DBUS_API_SUBJECT_TO_CHANGE -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { - LIBS_PRIVATE += $$QT_LIBS_DBUS + LIBS_PRIVATE += $$QMAKE_LIBS_DBUS DEFINES += QT_LINKED_LIBDBUS } |