diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-22 19:17:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 11:44:40 +0200 |
commit | b1a4d7f9fcada18199e25f0f3ac6cebe8616da07 (patch) | |
tree | 7a6966ff6611152e4d7b22ca5ebeb73ed8bbe88d /src/multimedia/multimedia.pro | |
parent | 631f3ab025fca83fcf578f035ed49ef9b288e9de (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
- pointless and commented out include and depend paths
- qmake -project boilerplate
Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia/multimedia.pro')
-rw-r--r-- | src/multimedia/multimedia.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index d43af113b..ab4d3a78e 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -1,24 +1,15 @@ -load(qt_module) +load(qt_build_config) TARGET = QtMultimedia -QPRO_PWD = $$PWD QT = core-private network gui -CONFIG += module - contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { } else { DEFINES += QT_NO_OPENGL } -!static:DEFINES += QT_MAKEDLL -DEFINES += QT_BUILD_MULTIMEDIA_LIB - load(qt_module_config) -HEADERS += qtmultimediaversion.h - - INCLUDEPATH *= . PRIVATE_HEADERS += \ |