diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
commit | b5294497836db44261c97cfeab28d0ac4f8402f1 (patch) | |
tree | c4331314445b41166ce2cd22a80c9fb9f46b5023 /demos/qmediaplayer/qmediaplayer.pro | |
parent | 2473ab1cf217a989849190cbfa47fe312698adb9 (diff) | |
parent | 1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff) | |
download | Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.zip Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.gz Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.bz2 |
Merge branch '4.6' into mmfphonon
Conflicts:
demos/qmediaplayer/mediaplayer.cpp
Diffstat (limited to 'demos/qmediaplayer/qmediaplayer.pro')
-rw-r--r-- | demos/qmediaplayer/qmediaplayer.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro index 2f15c28..9407a81 100644 --- a/demos/qmediaplayer/qmediaplayer.pro +++ b/demos/qmediaplayer/qmediaplayer.pro @@ -32,4 +32,6 @@ symbian { DEPLOYMENT += addFiles include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + + TARGET.CAPABILITY="NetworkServices" } |