slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Squashed commit of changes from the 4.8-temp branch.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
This commit is contained in:
Qt Continuous Integration System
2011-05-23 22:51:34 +10:00
parent eb15d0e412 add475cbc1
commit 40c5ec7297
13 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/multimedia/audiodevices/audiodevices.cpp
View File

@@ -47,7 +47,7 @@
QString toString(QAudioFormat::SampleType sampleType) QString toString(QAudioFormat::SampleType sampleType)
{ {
QString result("Unknown"); QString result;
switch (sampleType) { switch (sampleType) {
case QAudioFormat::SignedInt: case QAudioFormat::SignedInt:
result = "SignedInt"; result = "SignedInt";
@@ -58,7 +58,9 @@ QString toString(QAudioFormat::SampleType sampleType)
case QAudioFormat::Float: case QAudioFormat::Float:
result = "Float"; result = "Float";
break; break;
default:
case QAudioFormat::Unknown: case QAudioFormat::Unknown:
result = "Unknown";
break; break;
} }
return result; return result;

11
examples/multimedia/audiodevices/audiodevices.desktop Normal file
View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=Audio Devices
Exec=/opt/usr/bin/audiodevices
Icon=audiodevices
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable

2
examples/multimedia/audiodevices/audiodevices.pro
View File

@@ -15,3 +15,5 @@ symbian {
TARGET.UID3 = 0xA000D7BE TARGET.UID3 = 0xA000D7BE
CONFIG += qt_example CONFIG += qt_example
} }
maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)

11
examples/multimedia/audioinput/audioinput.desktop Normal file
View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=AudioInput
Exec=/opt/usr/bin/audioinput
Icon=audioinput
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable

3
examples/multimedia/audioinput/audioinput.pro
View File

@@ -15,3 +15,6 @@ symbian {
TARGET.CAPABILITY += UserEnvironment TARGET.CAPABILITY += UserEnvironment
CONFIG += qt_example CONFIG += qt_example
} }
maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
maemo5: warning(This example might not fully work on Maemo platform)

4
examples/multimedia/audioinput/main.cpp
View File

@@ -48,7 +48,11 @@ int main(int argv, char **args)
app.setApplicationName("Audio Input Test"); app.setApplicationName("Audio Input Test");
InputTest input; InputTest input;
#if defined(Q_OS_SYMBIAN)
input.showMaximized();
#else
input.show(); input.show();
#endif
return app.exec(); return app.exec();
} }

11
examples/multimedia/audiooutput/audiooutput.desktop Normal file
View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=Audio Output
Exec=/opt/usr/bin/audiooutput
Icon=audiooutput
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable

2
examples/multimedia/audiooutput/audiooutput.pro
View File

@@ -14,3 +14,5 @@ symbian {
TARGET.UID3 = 0xA000D7C0 TARGET.UID3 = 0xA000D7C0
CONFIG += qt_example CONFIG += qt_example
} }
maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
maemo5: warning(This example might not fully work on Maemo platform)

4
examples/multimedia/audiooutput/main.cpp
View File

@@ -49,7 +49,11 @@ int main(int argv, char **args)
app.setApplicationName("Audio Output Test"); app.setApplicationName("Audio Output Test");
AudioTest audio; AudioTest audio;
#if defined(Q_OS_SYMBIAN)
audio.showMaximized();
#else
audio.show(); audio.show();
#endif
return app.exec(); return app.exec();
} }

11
examples/multimedia/videographicsitem/videographicsitem.desktop Normal file
View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=Video Graphics Item
Exec=/opt/usr/bin/videographicsitem
Icon=videographicsitem
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable

3
examples/multimedia/videographicsitem/videographicsitem.pro
View File

@@ -19,3 +19,6 @@ symbian {
TARGET.UID3 = 0xA000D7C2 TARGET.UID3 = 0xA000D7C2
CONFIG += qt_example CONFIG += qt_example
} }
maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
symbian: warning(This example might not fully work on Symbian platform)

11
examples/multimedia/videowidget/videowidget.desktop Normal file
View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=Video Widget
Exec=/opt/usr/bin/videowidget
Icon=videowidget
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable

3
examples/multimedia/videowidget/videowidget.pro
View File

@@ -23,3 +23,6 @@ symbian {
TARGET.UID3 = 0xA000D7C3 TARGET.UID3 = 0xA000D7C3
CONFIG += qt_example CONFIG += qt_example
} }
maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
symbian: warning(This example might not fully work on Symbian platform)