diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 20:46:03 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 20:46:03 +1000 |
commit | e49b63f0ff2ceb8e472116a1a89c9122baff4974 (patch) | |
tree | febbc0c16d353eb4113c164e5498eaa495849394 | |
parent | db5f67926ebb5430cc75d00a8d39614c9ce5cda0 (diff) | |
parent | 9fe3d5c071732e945c7357074fed054ca28188cf (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging:
Use feature profile loading instead of direct inclusion.
Fixed DESTDIR after modularization.
-rw-r--r-- | src/phonon/phonon.pro | 2 | ||||
-rw-r--r-- | src/plugins/phonon/ds9/ds9.pro | 2 | ||||
-rw-r--r-- | src/plugins/phonon/gstreamer/gstreamer.pro | 4 | ||||
-rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 2 | ||||
-rw-r--r-- | src/plugins/phonon/qt7/qt7.pro | 2 | ||||
-rw-r--r-- | src/plugins/phonon/waveout/waveout.pro | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro index 9da6a25..db7605f 100644 --- a/src/phonon/phonon.pro +++ b/src/phonon/phonon.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = phonon QPRO_PWD = $$PWD -include($$QT_SOURCE_TREE/src/qbase.pri) +load(qt_module_config) PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION} PHONON_MINOR_VERSION = 4 diff --git a/src/plugins/phonon/ds9/ds9.pro b/src/plugins/phonon/ds9/ds9.pro index 4b6c0e7..9da0955 100644 --- a/src/plugins/phonon/ds9/ds9.pro +++ b/src/plugins/phonon/ds9/ds9.pro @@ -65,4 +65,4 @@ wince*:HEADERS += $$PHONON_DS9_DIR/videorenderer_default.h target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) diff --git a/src/plugins/phonon/gstreamer/gstreamer.pro b/src/plugins/phonon/gstreamer/gstreamer.pro index 1df4a78..642195b 100644 --- a/src/plugins/phonon/gstreamer/gstreamer.pro +++ b/src/plugins/phonon/gstreamer/gstreamer.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = phonon_gstreamer -DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend +DESTDIR = $$QT.phonon.plugins/phonon_backend DEPENDPATH += . INCLUDEPATH += . @@ -68,4 +68,4 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstractrenderer.cpp \ target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro index e3f9f82..b7fc0e2 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -142,7 +142,7 @@ symbian { target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target - include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) + load(qt_plugin) TARGET.UID3=0x2001E629 } diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro index d00ba88..db6b6d0 100644 --- a/src/plugins/phonon/qt7/qt7.pro +++ b/src/plugins/phonon/qt7/qt7.pro @@ -75,4 +75,4 @@ OBJECTIVE_SOURCES += $$PHONON_QUICKTIME_DIR/quicktimevideoplayer.mm \ target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) diff --git a/src/plugins/phonon/waveout/waveout.pro b/src/plugins/phonon/waveout/waveout.pro index 4816b66..2f46010 100644 --- a/src/plugins/phonon/waveout/waveout.pro +++ b/src/plugins/phonon/waveout/waveout.pro @@ -22,4 +22,4 @@ SOURCES += $$PHONON_WAVEOUT_DIR/audiooutput.cpp \ target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) |