slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build system cleanups

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/multimedia/multimedia.pro
View File

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