summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-12 12:12:03 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 14:56:04 +0200
commitf4439886f1afa95b9cbdd809d64a981bfe709ecf (patch)
treee5f990654c3565ff3bf4c465476088f636d73af6
parent846dfb4eebe106ab67ffbd2f4b166d02e168b828 (diff)
build system cleanups
- load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL Change-Id: Ide1099c5e742e7c9a17d2775645381cb0c6b321f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--src/feedback/feedback.pro8
-rw-r--r--src/plugins/feedback/immersion/immersion.pro2
-rw-r--r--src/plugins/feedback/meegotouch/meegotouch.pro2
-rw-r--r--src/plugins/feedback/mmk/mmk.pro2
-rw-r--r--sync.profile6
-rw-r--r--tests/auto/qfeedbackplugin/testplugin/testplugin.pro2
-rw-r--r--tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro2
-rw-r--r--tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro2
8 files changed, 7 insertions, 19 deletions
diff --git a/src/feedback/feedback.pro b/src/feedback/feedback.pro
index a0235a8..ce3d48b 100644
--- a/src/feedback/feedback.pro
+++ b/src/feedback/feedback.pro
@@ -1,14 +1,8 @@
-load(qt_module)
+load(qt_build_config)
TARGET = QtFeedback
-QPRO_PWD = $PWD
-
-CONFIG += module
-
QT = core
-DEFINES += QT_BUILD_FEEDBACK_LIB QT_MAKEDLL
-
load(qt_module_config)
PUBLIC_HEADERS += qfeedbackglobal.h \
diff --git a/src/plugins/feedback/immersion/immersion.pro b/src/plugins/feedback/immersion/immersion.pro
index dce7876..977eeaa 100644
--- a/src/plugins/feedback/immersion/immersion.pro
+++ b/src/plugins/feedback/immersion/immersion.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
TARGET = qtfeedback_immersion
QT = core feedback
diff --git a/src/plugins/feedback/meegotouch/meegotouch.pro b/src/plugins/feedback/meegotouch/meegotouch.pro
index afd626c..038a9fd 100644
--- a/src/plugins/feedback/meegotouch/meegotouch.pro
+++ b/src/plugins/feedback/meegotouch/meegotouch.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
TARGET = qtfeedback_meegotouch
QT = core feedback
diff --git a/src/plugins/feedback/mmk/mmk.pro b/src/plugins/feedback/mmk/mmk.pro
index 93e0ef6..3e12b63 100644
--- a/src/plugins/feedback/mmk/mmk.pro
+++ b/src/plugins/feedback/mmk/mmk.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
TARGET = qtfeedback_mmk
QT = core feedback multimedia
diff --git a/sync.profile b/sync.profile
index 240ebd5..d1fa413 100644
--- a/sync.profile
+++ b/sync.profile
@@ -3,12 +3,6 @@
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);
-%classnames = (
- "qtfeedbackversion.h" => "QtFeedbackVersion",
-);
-%mastercontent = (
- "feedback" => "#include <QtFeedback/QtFeedback>\n",
-);
# Module dependencies.
# Every module that is required to build this module should have one entry.
# Each of the module version specifiers can take one of the following values:
diff --git a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro
index 41de1f7..a56dfe5 100644
--- a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro
+++ b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
TARGET = qtfeedback_testplugin
QT = core feedback
diff --git a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
index 4e561b6..8e62b63 100644
--- a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
+++ b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
TARGET = qtfeedback_testplugin2
QT = core feedback
diff --git a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
index cda8cf6..c62acf6 100644
--- a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
+++ b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
TARGET = qtfeedback_testplugin3
QT = core feedback