diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 12:06:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 21:13:28 +0200 |
| commit | 910717fc44bb05035cf60f22eaba4db1051ffa65 (patch) | |
| tree | 3f7abdd81e32cfa8abd8b3e1cf47269d08e8e390 | |
| parent | a1e5bd1a4b2617b38e62adcfaa93164c80f0fb7a (diff) | |
centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | src/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 | ||||
| -rw-r--r-- | src/qml/qml.pro | 2 | ||||
| -rw-r--r-- | src/qmldevtools/qmldevtools.pro | 2 | ||||
| -rw-r--r-- | src/qmltest/qmltest.pro | 2 | ||||
| -rw-r--r-- | src/quick/quick.pro | 2 |
8 files changed, 1 insertions, 14 deletions
diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 0000000000..42ba8e45fb --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) diff --git a/src/particles/particles.pro b/src/particles/particles.pro index 482d723544..de855faf8a 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtQuickParticles CONFIG += dll warn_on internal_module diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro index c46dc356fa..9e89e45793 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = qmldbg_qtquick2 QT += qml-private quick-private core-private gui-private v8-private diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index fbc4c88a10..1208552652 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = qmldbg_tcp QT += qml-private network v8-private core-private diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 620db594a9..4b2cb20362 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtQml QT = core-private network QT_PRIVATE = v8-private diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 8d99404a1e..3da35264f9 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtQmlDevTools QT = core CONFIG += static internal_module diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index f1b3fb5c5b..3fa9561a9d 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtQuickTest CONFIG += dll warn_on diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 137055d720..4d271fcb15 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtQuick CONFIG += dll warn_on |