From d5dc46d319bb1f58f8a0ba64d2ef270eecbe8e65 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 13 Aug 2016 21:38:19 +0200 Subject: employ QMAKE_USE: LIBS += $$QMAKE_LIBS_FOO this migrates the cases where the build system already made (some) use of variables (possibly) set by configure. Change-Id: I43a08caed481d5f887a3a40821e71a4797760e7e Reviewed-by: Lars Knoll --- tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro | 3 +-- tests/auto/dbus/qdbustype/qdbustype.pro | 3 +-- tests/benchmarks/dbus/qdbustype/qdbustype.pro | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro index 21e665fa37..ed6084b702 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro @@ -7,8 +7,7 @@ QT = core-private dbus-private testlib contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QMAKE_LIBS_DBUS - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS + QMAKE_USE += dbus } else { SOURCES += ../../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro index e65b9ec5b3..fb0ebd6b1e 100644 --- a/tests/auto/dbus/qdbustype/qdbustype.pro +++ b/tests/auto/dbus/qdbustype/qdbustype.pro @@ -4,8 +4,7 @@ QT = core-private dbus-private testlib SOURCES += tst_qdbustype.cpp contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QMAKE_LIBS_DBUS - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS + QMAKE_USE += dbus } else { SOURCES += ../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index 8d2f45edf8..dd97169551 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -3,8 +3,7 @@ QT -= gui QT += core-private dbus-private testlib contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QMAKE_LIBS_DBUS - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS + QMAKE_USE += dbus } else { SOURCES += ../../../../src/dbus/qdbus_symbols.cpp } -- cgit v1.2.3