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/multimediawidgets/multimediawidgets.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/multimediawidgets/multimediawidgets.pro')
-rw-r--r-- | src/multimediawidgets/multimediawidgets.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index 10d8b7458..63c58abd6 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -1,11 +1,10 @@ -load(qt_module) +load(qt_build_config) # distinct from QtMultimedia TARGET = QtMultimediaWidgets -QPRO_PWD = $$PWD QT = core gui multimedia-private widgets-private -CONFIG += module no_private_qt_headers_warning +CONFIG += no_private_qt_headers_warning load(qt_module_config) @@ -16,16 +15,12 @@ contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { DEFINES += QT_NO_OPENGL } -!static:DEFINES += QT_MAKEDLL -DEFINES += QT_BUILD_MULTIMEDIAWIDGETS_LIB - PRIVATE_HEADERS += \ qvideowidget_p.h \ qpaintervideosurface_p.h \ PUBLIC_HEADERS += \ qtmultimediawidgetdefs.h \ - qtmultimediawidgetsversion.h \ qcameraviewfinder.h \ qgraphicsvideoitem.h \ qvideowidgetcontrol.h \ |