From ac29efda2abf2681eda18742425ad38bb1a7c144 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Sep 2012 12:14:37 +0200 Subject: [PATCH] centralize load(qt_build_config)s in .qmake.conf Change-Id: Ifbef0323f3a3fc80b10ac2c8c8a8a68ce646c1e6 Reviewed-by: Daniel Teske Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 1 + src/assistant/clucene/clucene.pro | 2 -- src/assistant/help/help.pro | 2 -- src/designer/src/components/lib/lib.pro | 2 -- src/designer/src/designer/designer.pro | 2 -- src/designer/src/lib/lib.pro | 2 -- src/designer/src/uitools/uitools.pro | 2 -- src/linguist/linguist/linguist.pro | 2 -- src/linguist/lrelease/lrelease.pro | 2 -- src/linguist/lupdate/lupdate.pro | 2 -- src/qtconfig/qtconfig.pro | 2 -- 11 files changed, 1 insertion(+), 20 deletions(-) create mode 100644 .qmake.conf diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 0000000..42ba8e4 --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro index a50fb43..63c2e32 100644 --- a/src/assistant/clucene/clucene.pro +++ b/src/assistant/clucene/clucene.pro @@ -1,7 +1,5 @@ MODULE = clucene -load(qt_build_config) - TARGET = QtCLucene QT = core CONFIG += internal_module diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro index 7e704a7..72a8a3c 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtHelp QT = core-private gui widgets QT_PRIVATE = network sql clucene-private diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index 1437676..fa6caf0 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - MODULE = designercomponents TARGET = QtDesignerComponents QT = core gui-private widgets-private designer-private diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 73e2b60..29a0196 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - DESTDIR = $$QT.designer.bins QT += core-private widgets xml network designer-private designercomponents !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 707b19e..33331f0 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -1,7 +1,5 @@ MODULE = designer -load(qt_build_config) - TARGET = QtDesigner QT = core-private gui-private widgets-private xml diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index af48b5c..69d6393 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtUiTools CONFIG += static QT = core diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index 337e77d..7b1903f 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TEMPLATE = app LANGUAGE = C++ DESTDIR = $$QT.designer.bins diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro index 20e137b..ab281e3 100644 --- a/src/linguist/lrelease/lrelease.pro +++ b/src/linguist/lrelease/lrelease.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - DESTDIR = $$QT.designer.bins QT = core-private diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro index 67a5aac..8accc79 100644 --- a/src/linguist/lupdate/lupdate.pro +++ b/src/linguist/lupdate/lupdate.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - DESTDIR = $$QT.designer.bins QT = core-private diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro index 7b904c0..c5a6b6f 100644 --- a/src/qtconfig/qtconfig.pro +++ b/src/qtconfig/qtconfig.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TEMPLATE = app CONFIG += qt warn_on x11 build_all:!build_pass { -- 2.7.4