qiurui
/
qtfeedback
mirror of https://github.com/qt/qtfeedback.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Oswald Buddenhagen 2012-04-12 12:12:03 +02:00 committed by Qt by Nokia
parent 846dfb4eeb
commit f4439886f1
8 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/feedback/feedback.pro
View File

@ -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 \

2
src/plugins/feedback/immersion/immersion.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qtfeedback_immersion
QT = core feedback

2
src/plugins/feedback/meegotouch/meegotouch.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qtfeedback_meegotouch
QT = core feedback

2
src/plugins/feedback/mmk/mmk.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qtfeedback_mmk
QT = core feedback multimedia

6
sync.profile
View File

@ -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:

2
tests/auto/qfeedbackplugin/testplugin/testplugin.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qtfeedback_testplugin
QT = core feedback

2
tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qtfeedback_testplugin2
QT = core feedback

2
tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
View File

@ -1,4 +1,4 @@
load(qt_module)
load(qt_build_config)
TARGET = qtfeedback_testplugin3
QT = core feedback