From e5d673ac0c1bc8c5a7148097dfa157dd32023e68 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Date: Mon, 3 Sep 2012 12:16:04 +0200 Subject: [PATCH] centralize load(qt_build_config)s in .qmake.conf Change-Id: Ide097efe50d6d1d4b42ef6980c83f3e9ad7d2ba1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> --- .qmake.conf | 1 + src/xmlpatterns/xmlpatterns.pro | 2 -- tests/auto/xmlpatternsschema/xmlpatternsschema.pro | 1 - tests/auto/xmlpatternssdk/xmlpatternssdk.pro | 2 -- 4 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 .qmake.conf diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 00000000..42ba8e45 --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index fa570663..7d67631b 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtXmlPatterns CONFIG += exceptions QT = core-private network diff --git a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro index 28239361..0f323f7a 100644 --- a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro +++ b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro @@ -1,7 +1,6 @@ TARGET = tst_xmlpatternsschema CONFIG += testcase QT += testlib -load(qt_build_config) SOURCES += tst_xmlpatternsschema.cpp \ diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro index 7f908fd1..40584c78 100644 --- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro +++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - include (../xmlpatterns.pri) TARGET = $$XMLPATTERNS_SDK -- GitLab