summaryrefslogtreecommitdiffstats
path: root/examples/phonon
diff options
context:
space:
mode:
Diffstat (limited to 'examples/phonon')
-rw-r--r--examples/phonon/phonon.pro2
-rw-r--r--examples/phonon/qmusicplayer/main.cpp (renamed from examples/phonon/musicplayer/main.cpp)0
-rw-r--r--examples/phonon/qmusicplayer/mainwindow.cpp (renamed from examples/phonon/musicplayer/mainwindow.cpp)0
-rw-r--r--examples/phonon/qmusicplayer/mainwindow.h (renamed from examples/phonon/musicplayer/mainwindow.h)0
-rw-r--r--examples/phonon/qmusicplayer/qmusicplayer.pro (renamed from examples/phonon/musicplayer/musicplayer.pro)4
5 files changed, 3 insertions, 3 deletions
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro
index 0ddf767..aa6ac13 100644
--- a/examples/phonon/phonon.pro
+++ b/examples/phonon/phonon.pro
@@ -1,6 +1,6 @@
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS = musicplayer \
+SUBDIRS = qmusicplayer \
capabilities
# install
diff --git a/examples/phonon/musicplayer/main.cpp b/examples/phonon/qmusicplayer/main.cpp
index fc7baa3..fc7baa3 100644
--- a/examples/phonon/musicplayer/main.cpp
+++ b/examples/phonon/qmusicplayer/main.cpp
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp
index 787ae53..787ae53 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/qmusicplayer/mainwindow.cpp
diff --git a/examples/phonon/musicplayer/mainwindow.h b/examples/phonon/qmusicplayer/mainwindow.h
index 41f8147..41f8147 100644
--- a/examples/phonon/musicplayer/mainwindow.h
+++ b/examples/phonon/qmusicplayer/mainwindow.h
diff --git a/examples/phonon/musicplayer/musicplayer.pro b/examples/phonon/qmusicplayer/qmusicplayer.pro
index a0c953a..25ab7eb 100644
--- a/examples/phonon/musicplayer/musicplayer.pro
+++ b/examples/phonon/qmusicplayer/qmusicplayer.pro
@@ -5,9 +5,9 @@ SOURCES += main.cpp \
mainwindow.cpp
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/phonon/musicplayer
+target.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmusicplayer
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images
-sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/musicplayer
+sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmusicplayer
INSTALLS += target sources
wince*{