From b1a4d7f9fcada18199e25f0f3ac6cebe8616da07 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 22 May 2012 19:17:51 +0200 Subject: 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 Reviewed-by: Michael Goddard --- src/multimediawidgets/multimediawidgets.pro | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/multimediawidgets') 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 \ -- cgit v1.2.3