From 0fcd842cecfc15b5153b89b95e9c67b894daf3a6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Sep 2016 19:52:06 +0200 Subject: remove unnecessary references to $$QMAKE_CFLAGS_DBUS it does not appear that the tests actually use these flags in any way; they don't include any (actual) d-bus headers and have no ifdefs. and the qdbus module already pulls in the flags via QMAKE_USE (in the case where they are defined at all, i.e., dbus-linked). Change-Id: Ie6bc6da7d1dd96da7b73f2d0fe45576936715874 Reviewed-by: Thiago Macieira --- src/dbus/dbus.pro | 1 - tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 2 -- tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 - 3 files changed, 4 deletions(-) diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 43050dcea2..3da35b1741 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -3,7 +3,6 @@ QT = core-private MODULE_CONFIG = dbusadaptors dbusinterfaces DEFINES += DBUS_API_SUBJECT_TO_CHANGE -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS qtConfig(dbus-linked) { QMAKE_USE_PRIVATE += dbus DEFINES += QT_LINKED_LIBDBUS diff --git a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro index fa232b323b..7389e9d44a 100644 --- a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -2,8 +2,6 @@ CONFIG += testcase QT = core testlib dbus TARGET = tst_qdbuscpp2xml -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS - SOURCES += tst_qdbuscpp2xml.cpp \ RESOURCES += qdbuscpp2xml.qrc diff --git a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 02910b0267..9fc0af98b4 100644 --- a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -2,4 +2,3 @@ CONFIG += testcase QT = core testlib TARGET = tst_qdbusxml2cpp SOURCES += tst_qdbusxml2cpp.cpp -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS -- cgit v1.2.3