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

4
config.tests/alsa/alsa.pro
View File

@@ -1,7 +1,3 @@
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += .
SOURCES = alsatest.cpp SOURCES = alsatest.cpp
CONFIG -= qt dylib CONFIG -= qt dylib

4
config.tests/openal/openal.pro
View File

@@ -1,7 +1,3 @@
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += .
SOURCES += main.cpp SOURCES += main.cpp
win32 { win32 {

1
config.tests/pulseaudio/pulseaudio.pro
View File

@@ -1,5 +1,4 @@
CONFIG -= qt CONFIG -= qt
LIBS +=
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += \ PKGCONFIG += \

11
src/multimedia/multimedia.pro
View File

@@ -1,24 +1,15 @@
load(qt_module) load(qt_build_config)
TARGET = QtMultimedia TARGET = QtMultimedia
QPRO_PWD = $$PWD
QT = core-private network gui QT = core-private network gui
CONFIG += module
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
} else { } else {
DEFINES += QT_NO_OPENGL DEFINES += QT_NO_OPENGL
} }
!static:DEFINES += QT_MAKEDLL
DEFINES += QT_BUILD_MULTIMEDIA_LIB
load(qt_module_config) load(qt_module_config)
HEADERS += qtmultimediaversion.h
INCLUDEPATH *= . INCLUDEPATH *= .
PRIVATE_HEADERS += \ PRIVATE_HEADERS += \

9
src/multimediawidgets/multimediawidgets.pro
View File

@@ -1,11 +1,10 @@
load(qt_module) load(qt_build_config)
# distinct from QtMultimedia # distinct from QtMultimedia
TARGET = QtMultimediaWidgets TARGET = QtMultimediaWidgets
QPRO_PWD = $$PWD
QT = core gui multimedia-private widgets-private QT = core gui multimedia-private widgets-private
CONFIG += module no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
load(qt_module_config) load(qt_module_config)
@@ -16,16 +15,12 @@ contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
DEFINES += QT_NO_OPENGL DEFINES += QT_NO_OPENGL
} }
!static:DEFINES += QT_MAKEDLL
DEFINES += QT_BUILD_MULTIMEDIAWIDGETS_LIB
PRIVATE_HEADERS += \ PRIVATE_HEADERS += \
qvideowidget_p.h \ qvideowidget_p.h \
qpaintervideosurface_p.h \ qpaintervideosurface_p.h \
PUBLIC_HEADERS += \ PUBLIC_HEADERS += \
qtmultimediawidgetdefs.h \ qtmultimediawidgetdefs.h \
qtmultimediawidgetsversion.h \
qcameraviewfinder.h \ qcameraviewfinder.h \
qgraphicsvideoitem.h \ qgraphicsvideoitem.h \
qvideowidgetcontrol.h \ qvideowidgetcontrol.h \

2
src/plugins/audiocapture/audiocapture.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = qtmedia_audioengine TARGET = qtmedia_audioengine
QT += multimedia-private QT += multimedia-private

2
src/plugins/directshow/directshow.pro
View File

@@ -7,8 +7,6 @@ PLUGIN_TYPE=mediaservice
QT += multimedia QT += multimedia
DEPENDPATH += .
HEADERS += dsserviceplugin.h HEADERS += dsserviceplugin.h
SOURCES += dsserviceplugin.cpp SOURCES += dsserviceplugin.cpp

2
src/plugins/gstreamer/audiodecoder/audiodecoder.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = gstaudiodecoder TARGET = gstaudiodecoder
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice

2
src/plugins/gstreamer/camerabin/camerabin.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = gstcamerabin TARGET = gstcamerabin
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice

2
src/plugins/gstreamer/mediacapture/mediacapture.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = gstmediacapture TARGET = gstmediacapture
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice

2
src/plugins/gstreamer/mediaplayer/mediaplayer.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = gstmediaplayer TARGET = gstmediaplayer
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice

2
src/plugins/m3u/m3u.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = qtmultimedia_m3u TARGET = qtmultimedia_m3u
QT += multimedia-private QT += multimedia-private

2
src/plugins/pulseaudio/pulseaudio.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = qtmedia_pulse TARGET = qtmedia_pulse
QT += multimedia-private QT += multimedia-private

2
src/plugins/qt7/qt7.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
# Avoid clash with a variable named `slots' in a Quartz header # Avoid clash with a variable named `slots' in a Quartz header
CONFIG += no_keywords CONFIG += no_keywords

2
src/plugins/v4l/v4l.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = qtmedia_v4lengine TARGET = qtmedia_v4lengine
QT += multimedia-private QT += multimedia-private

4
src/plugins/wmf/wmf.pro
View File

@@ -1,4 +1,4 @@
load(qt_module) load(qt_build_config)
TARGET = wmfengine TARGET = wmfengine
QT += multimedia-private network QT += multimedia-private network
@@ -12,8 +12,6 @@ load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
DEPENDPATH += .
HEADERS += wmfserviceplugin.h HEADERS += wmfserviceplugin.h
SOURCES += wmfserviceplugin.cpp SOURCES += wmfserviceplugin.cpp

3
src/qtmultimediaquicktools/qtmultimediaquicktools.pro
View File

@@ -1,9 +1,8 @@
load(qt_module) load(qt_build_config)
TEMPLATE = lib TEMPLATE = lib
TARGET = QtMultimediaQuick_p TARGET = QtMultimediaQuick_p
QPRO_PWD = $$PWD
QT = core quick multimedia-private QT = core quick multimedia-private
!static:DEFINES += QT_MAKEDLL !static:DEFINES += QT_MAKEDLL

11
sync.profile
View File

@@ -6,17 +6,6 @@
%moduleheaders = ( # restrict the module headers to those found in relative path %moduleheaders = ( # restrict the module headers to those found in relative path
); );
%classnames = (
"qtmultimediaversion.h" => "QtMultimediaVersion",
"qtmultimediawidgetsversion.h" => "QtMultimediaWidgetsVersion",
);
%mastercontent = (
"gui" => "#include <QtGui/QtGui>\n",
"network" => "#include <QtNetwork/QtNetwork>\n",
"core" => "#include <QtCore/QtCore>\n",
);
# Module dependencies. # Module dependencies.
# Every module that is required to build this module should have one entry. # Every module that is required to build this module should have one entry.
# Each of the module version specifiers can take one of the following values: # Each of the module version specifiers can take one of the following values:

2
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
View File

@@ -1,5 +1,5 @@
load(qt_module) load(qt_build_config)
TARGET = mockserviceplugin1 TARGET = mockserviceplugin1
QT += multimedia-private QT += multimedia-private

2
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
View File

@@ -1,5 +1,5 @@
load(qt_module) load(qt_build_config)
TARGET = mockserviceplugin2 TARGET = mockserviceplugin2
QT += multimedia-private QT += multimedia-private

2
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
View File

@@ -1,5 +1,5 @@
load(qt_module) load(qt_build_config)
TARGET = mockserviceplugin3 TARGET = mockserviceplugin3
QT += multimedia-private QT += multimedia-private

2
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
View File

@@ -1,5 +1,5 @@
load(qt_module) load(qt_build_config)
TARGET = mockserviceplugin4 TARGET = mockserviceplugin4
QT += multimedia-private QT += multimedia-private