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>

9 files changed, 6 insertions, 31 deletions

diff --git a/examples/phonon/qmediaplayer/qmediaplayer.pro b/examples/phonon/qmediaplayer/qmediaplayer.pro
index eaa9f6c..9537317 100644
--- a/examples/phonon/qmediaplayer/qmediaplayer.pro
+++ b/examples/phonon/qmediaplayer/qmediaplayer.pro
@@ -1,10 +1,3 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Aug 23 18:02:14 2007
-######################################################################
-
-TEMPLATE = app
-DEPENDPATH += . build src ui
-
 QT += phonon widgets
 
 FORMS += settings.ui
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
diff --git a/sync.profile b/sync.profile
index bea6e34..090a71e 100644
--- a/sync.profile
+++ b/sync.profile
@@ -6,11 +6,6 @@
 );
 %classnames = (
 );
-%mastercontent = (
-    "core" => "#include <QtCore/QtCore>\n",
-    "gui" => "#include <QtGui/QtGui>\n",
-    "network" => "#include <QtNetwork/QtNetwork>\n",
-);
 # Module dependencies.
 # 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:
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro
index 9797500..016a33b 100644
--- a/tests/auto/mediaobject/dummy/dummy.pro
+++ b/tests/auto/mediaobject/dummy/dummy.pro
@@ -9,8 +9,6 @@ CONFIG += qt plugin
 
 TARGET = phonon_dummy
 DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT           += phonon