diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 21:59:01 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 21:59:01 +1000 |
| commit | c584633aeb8b26be864200c62ca0cdf7ac601e84 (patch) | |
| tree | 49934bdb65374b8b2b1b1ded8c3961acc4e41be4 | |
| parent | 0b6ab62b87aaaf362c4ac33f568bd21488e75117 (diff) | |
| parent | 459884f0edb3c3a0a1f0e2951bc0e3e16b0e087a (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:
Merge the demos and examples in qtphonon.
| -rw-r--r-- | examples/phonon/phonon.pro | 3 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/images/screen.png (renamed from demos/qmediaplayer/images/screen.png) | bin | 4358 -> 4358 bytes | |||
| -rw-r--r-- | examples/phonon/qmediaplayer/main.cpp (renamed from demos/qmediaplayer/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/mediaplayer.cpp (renamed from demos/qmediaplayer/mediaplayer.cpp) | 0 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/mediaplayer.h (renamed from demos/qmediaplayer/mediaplayer.h) | 0 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/mediaplayer.qrc (renamed from demos/qmediaplayer/mediaplayer.qrc) | 0 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/qmediaplayer.pro (renamed from demos/qmediaplayer/qmediaplayer.pro) | 4 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/settings.ui (renamed from demos/qmediaplayer/settings.ui) | 0 |
8 files changed, 4 insertions, 3 deletions
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro index ee1e018..4246f75 100644 --- a/examples/phonon/phonon.pro +++ b/examples/phonon/phonon.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = qmusicplayer \ +SUBDIRS = qmediaplayer \ + qmusicplayer \ capabilities # Disable capabilities example for symbian-gcce due to a bug in elf2e32. diff --git a/demos/qmediaplayer/images/screen.png b/examples/phonon/qmediaplayer/images/screen.png Binary files differindex a15df92..a15df92 100644 --- a/demos/qmediaplayer/images/screen.png +++ b/examples/phonon/qmediaplayer/images/screen.png diff --git a/demos/qmediaplayer/main.cpp b/examples/phonon/qmediaplayer/main.cpp index aee7d2b..aee7d2b 100644 --- a/demos/qmediaplayer/main.cpp +++ b/examples/phonon/qmediaplayer/main.cpp diff --git a/demos/qmediaplayer/mediaplayer.cpp b/examples/phonon/qmediaplayer/mediaplayer.cpp index 91f24b7..91f24b7 100644 --- a/demos/qmediaplayer/mediaplayer.cpp +++ b/examples/phonon/qmediaplayer/mediaplayer.cpp diff --git a/demos/qmediaplayer/mediaplayer.h b/examples/phonon/qmediaplayer/mediaplayer.h index 0b9dcf3..0b9dcf3 100644 --- a/demos/qmediaplayer/mediaplayer.h +++ b/examples/phonon/qmediaplayer/mediaplayer.h diff --git a/demos/qmediaplayer/mediaplayer.qrc b/examples/phonon/qmediaplayer/mediaplayer.qrc index bcdf404..bcdf404 100644 --- a/demos/qmediaplayer/mediaplayer.qrc +++ b/examples/phonon/qmediaplayer/mediaplayer.qrc diff --git a/demos/qmediaplayer/qmediaplayer.pro b/examples/phonon/qmediaplayer/qmediaplayer.pro index 14cfb6f..901cf5e 100644 --- a/demos/qmediaplayer/qmediaplayer.pro +++ b/examples/phonon/qmediaplayer/qmediaplayer.pro @@ -15,9 +15,9 @@ RESOURCES += mediaplayer.qrc SOURCES += main.cpp mediaplayer.cpp HEADERS += mediaplayer.h -target.path = $$[QT_INSTALL_DEMOS]/qtphonon/qmediaplayer +target.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmediaplayer sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_DEMOS]/qtphonon/qmediaplayer +sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmediaplayer INSTALLS += target sources wince*{ diff --git a/demos/qmediaplayer/settings.ui b/examples/phonon/qmediaplayer/settings.ui index 03bd70e..03bd70e 100644 --- a/demos/qmediaplayer/settings.ui +++ b/examples/phonon/qmediaplayer/settings.ui |
