summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-08 04:50:54 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-08 04:50:54 +1000
commit0b6ab62b87aaaf362c4ac33f568bd21488e75117 (patch)
treea3b4b88aa2884b868780deadbb29145b03e2302d
parente49b63f0ff2ceb8e472116a1a89c9122baff4974 (diff)
parentbe54e6f9b8df491920c4b6614e67c48acc65a2c1 (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: Fix usage of QT_SOURCE_TREE
-rw-r--r--examples/phonon/capabilities/capabilities.pro4
-rw-r--r--examples/phonon/qmusicplayer/qmusicplayer.pro4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/phonon/capabilities/capabilities.pro b/examples/phonon/capabilities/capabilities.pro
index 82c895d..c8b2787 100644
--- a/examples/phonon/capabilities/capabilities.pro
+++ b/examples/phonon/capabilities/capabilities.pro
@@ -16,9 +16,9 @@ wince*{
symbian {
TARGET.UID3 = 0xA000CF69
- include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+ CONFIG += qt_example
}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/phonon/qmusicplayer/qmusicplayer.pro b/examples/phonon/qmusicplayer/qmusicplayer.pro
index bc18088..7af7274 100644
--- a/examples/phonon/qmusicplayer/qmusicplayer.pro
+++ b/examples/phonon/qmusicplayer/qmusicplayer.pro
@@ -16,9 +16,9 @@ wince*{
symbian {
TARGET.UID3 = 0xA000CF6A
- include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+ CONFIG += qt_example
}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)