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 /src/multimedia/mediaservices/playback/playback.pri | |
| 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 'src/multimedia/mediaservices/playback/playback.pri')
| -rw-r--r-- | src/multimedia/mediaservices/playback/playback.pri | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/multimedia/mediaservices/playback/playback.pri b/src/multimedia/mediaservices/playback/playback.pri deleted file mode 100644 index 09a81c9..0000000 --- a/src/multimedia/mediaservices/playback/playback.pri +++ /dev/null @@ -1,11 +0,0 @@ - -HEADERS += \ - $$PWD/qmediaplayer.h \ - $$PWD/qmediaplayercontrol.h - -SOURCES += \ - $$PWD/qmediaplayer.cpp \ - $$PWD/qmediaplayercontrol.cpp - - - |