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>
This commit is contained in:
Oswald Buddenhagen
2012-05-22 19:17:51 +02:00
committed by Qt by Nokia
parent 631f3ab025
commit b1a4d7f9fc
22 changed files with 18 additions and 57 deletions

View File

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