diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-19 13:52:54 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-19 13:52:54 (GMT) |
| commit | 14ddb8172cce8c90f01436ab8215cc8ed594e251 (patch) | |
| tree | 04e860f80d7f3e9773996b62d4c56ad92497a096 /demos/multimedia/player/player.pro | |
| parent | 6bdba9c7909d8f53e28823b16e82f89650eea16d (diff) | |
| parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
| download | Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.zip Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.gz Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.bz2 | |
Merge commit 'remotes/origin/4.7' into symbian47
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'demos/multimedia/player/player.pro')
| -rw-r--r-- | demos/multimedia/player/player.pro | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/demos/multimedia/player/player.pro b/demos/multimedia/player/player.pro deleted file mode 100644 index 12bdf64..0000000 --- a/demos/multimedia/player/player.pro +++ /dev/null @@ -1,29 +0,0 @@ -TEMPLATE = app -TARGET = player - -QT += gui mediaservices - -HEADERS = \ - player.h \ - playercontrols.h \ - playlistmodel.h \ - videowidget.h - -SOURCES = \ - main.cpp \ - player.cpp \ - playercontrols.cpp \ - playlistmodel.cpp \ - videowidget.cpp - -target.path = $$[QT_INSTALL_DEMOS]/multimedia/player -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_DEMOS]/multimedia/player - -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xA000E3FA - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) -} - |