diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:28:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:43:20 +0200 |
| commit | 2f6f3a9a2fc086a39eeb87cc56b6a928fa4ba8fc (patch) | |
| tree | be004bfdad781b56b53a933c1c0ad37087f8658c /src | |
| parent | 25e10e1e8a33059cac946c102875523a34f92199 (diff) | |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- setup of PKGCONFIG* variables (automated now)
- %mastercontent assignment (automated now)
- pointless QPRO_PWD assignments
- pointless and commented out include and depend paths
- qmake -project boilerplate
Change-Id: Ie75ffb4f3ff789a8bfa9f1ddbd92e13c9c9fafa7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/phonon/phonon.pro | 7 | ||||
| -rw-r--r-- | src/plugins/phonon/ds9/ds9.pro | 2 | ||||
| -rw-r--r-- | src/plugins/phonon/gstreamer/gstreamer.pro | 5 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 2 | ||||
| -rw-r--r-- | src/plugins/phonon/qt7/qt7.pro | 5 | ||||
| -rw-r--r-- | src/plugins/phonon/waveout/waveout.pro | 2 |
6 files changed, 6 insertions, 17 deletions
diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro index 4ad7b23..7c44f6f 100644 --- a/src/phonon/phonon.pro +++ b/src/phonon/phonon.pro @@ -1,7 +1,6 @@ -load(qt_module) +load(qt_build_config) TARGET = phonon -QPRO_PWD = $$PWD QT += widgets # This would conflict with the Qt 4.x build. @@ -10,13 +9,10 @@ QT += widgets load(qt_module_config) -DEPENDPATH += . DEFINES += MAKE_PHONON_LIB PHONON_DIR = ../3rdparty/phonon/phonon -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork - # Input HEADERS += $$PHONON_DIR/abstractaudiooutput.h \ $$PHONON_DIR/abstractaudiooutput_p.h \ @@ -121,7 +117,6 @@ contains(QT_CONFIG, dbus) { QT += dbus HEADERS += $$PHONON_DIR/audiooutputadaptor_p.h SOURCES += $$PHONON_DIR/audiooutputadaptor.cpp - unix:QMAKE_PKGCONFIG_REQUIRES += QtDBus } else { DEFINES += QT_NO_DBUS } diff --git a/src/plugins/phonon/ds9/ds9.pro b/src/plugins/phonon/ds9/ds9.pro index 5d8d5f9..83b410b 100644 --- a/src/plugins/phonon/ds9/ds9.pro +++ b/src/plugins/phonon/ds9/ds9.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend QT += phonon diff --git a/src/plugins/phonon/gstreamer/gstreamer.pro b/src/plugins/phonon/gstreamer/gstreamer.pro index 34b2a5b..f8a4911 100644 --- a/src/plugins/phonon/gstreamer/gstreamer.pro +++ b/src/plugins/phonon/gstreamer/gstreamer.pro @@ -1,11 +1,8 @@ -load(qt_module) +load(qt_build_config) TARGET = phonon_gstreamer DESTDIR = $$QT.phonon.plugins/phonon_backend -DEPENDPATH += . -INCLUDEPATH += . - QT += phonon contains(QT_CONFIG, opengl):QT += opengl diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro index 3aff698..7d78fb1 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) # MMF Phonon backend symbian { diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro index 9eab58b..8fb93d5 100644 --- a/src/plugins/phonon/qt7/qt7.pro +++ b/src/plugins/phonon/qt7/qt7.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) QT += opengl phonon TARGET = phonon_qt7 @@ -18,9 +18,6 @@ LIBS += -framework AppKit -framework AudioUnit \ -framework AudioToolbox -framework CoreAudio \ -framework QuartzCore -framework QTKit -DEPENDPATH += . -INCLUDEPATH += . - PHONON_QUICKTIME_DIR=../../../3rdparty/phonon/qt7 # Input diff --git a/src/plugins/phonon/waveout/waveout.pro b/src/plugins/phonon/waveout/waveout.pro index 6a990ab..3ff2a62 100644 --- a/src/plugins/phonon/waveout/waveout.pro +++ b/src/plugins/phonon/waveout/waveout.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend QT += phonon |