From c5c945049760bb6ea68997f325e5a7a8cf73a4ae Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 27 Apr 2011 19:16:41 +0200 Subject: [PATCH 1/2] Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44) --- examples/multimedia/audiodevices/audiodevices.cpp | 4 +++- examples/multimedia/audiodevices/audiodevices.pro | 2 ++ examples/multimedia/audioinput/audioinput.pro | 3 +++ examples/multimedia/audioinput/main.cpp | 4 ++++ examples/multimedia/audiooutput/audiooutput.pro | 2 ++ examples/multimedia/audiooutput/main.cpp | 4 ++++ examples/multimedia/videographicsitem/videographicsitem.pro | 3 +++ examples/multimedia/videowidget/videowidget.pro | 3 +++ 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp index 8af6ce74..fcc433fb 100644 --- a/examples/multimedia/audiodevices/audiodevices.cpp +++ b/examples/multimedia/audiodevices/audiodevices.cpp @@ -47,7 +47,7 @@ QString toString(QAudioFormat::SampleType sampleType) { - QString result("Unknown"); + QString result; switch (sampleType) { case QAudioFormat::SignedInt: result = "SignedInt"; @@ -58,7 +58,9 @@ QString toString(QAudioFormat::SampleType sampleType) case QAudioFormat::Float: result = "Float"; break; + default: case QAudioFormat::Unknown: + result = "Unknown"; break; } return result; diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro index d033f1d2..e86af498 100644 --- a/examples/multimedia/audiodevices/audiodevices.pro +++ b/examples/multimedia/audiodevices/audiodevices.pro @@ -15,3 +15,5 @@ symbian { TARGET.UID3 = 0xA000D7BE CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro index d44d3a6b..b474a8cb 100644 --- a/examples/multimedia/audioinput/audioinput.pro +++ b/examples/multimedia/audioinput/audioinput.pro @@ -15,3 +15,6 @@ symbian { TARGET.CAPABILITY += UserEnvironment CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +maemo5: warning(This example might not fully work on Maemo platform) diff --git a/examples/multimedia/audioinput/main.cpp b/examples/multimedia/audioinput/main.cpp index dd25f62f..bdae9986 100644 --- a/examples/multimedia/audioinput/main.cpp +++ b/examples/multimedia/audioinput/main.cpp @@ -48,7 +48,11 @@ int main(int argv, char **args) app.setApplicationName("Audio Input Test"); InputTest input; +#if defined(Q_OS_SYMBIAN) + input.showMaximized(); +#else input.show(); +#endif return app.exec(); } diff --git a/examples/multimedia/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro index e7ae9ce6..ca884e21 100644 --- a/examples/multimedia/audiooutput/audiooutput.pro +++ b/examples/multimedia/audiooutput/audiooutput.pro @@ -14,3 +14,5 @@ symbian { TARGET.UID3 = 0xA000D7C0 CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) +maemo5: warning(This example might not fully work on Maemo platform) diff --git a/examples/multimedia/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp index 389a35d6..8492f81b 100644 --- a/examples/multimedia/audiooutput/main.cpp +++ b/examples/multimedia/audiooutput/main.cpp @@ -49,7 +49,11 @@ int main(int argv, char **args) app.setApplicationName("Audio Output Test"); AudioTest audio; +#if defined(Q_OS_SYMBIAN) + audio.showMaximized(); +#else audio.show(); +#endif return app.exec(); } diff --git a/examples/multimedia/videographicsitem/videographicsitem.pro b/examples/multimedia/videographicsitem/videographicsitem.pro index 7fcdf4ae..3ad1bc1d 100644 --- a/examples/multimedia/videographicsitem/videographicsitem.pro +++ b/examples/multimedia/videographicsitem/videographicsitem.pro @@ -19,3 +19,6 @@ symbian { TARGET.UID3 = 0xA000D7C2 CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +symbian: warning(This example might not fully work on Symbian platform) diff --git a/examples/multimedia/videowidget/videowidget.pro b/examples/multimedia/videowidget/videowidget.pro index 80f2a1f6..90665b6d 100644 --- a/examples/multimedia/videowidget/videowidget.pro +++ b/examples/multimedia/videowidget/videowidget.pro @@ -23,3 +23,6 @@ symbian { TARGET.UID3 = 0xA000D7C3 CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +symbian: warning(This example might not fully work on Symbian platform) From add475cbc1c18c38e6df8b0b1317c86f5c7d1916 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 11 May 2011 17:35:46 +0200 Subject: [PATCH 2/2] Squashed commit of changes from the 4.8-temp branch. --- examples/multimedia/audiodevices/audiodevices.desktop | 11 +++++++++++ examples/multimedia/audioinput/audioinput.desktop | 11 +++++++++++ examples/multimedia/audiooutput/audiooutput.desktop | 11 +++++++++++ .../videographicsitem/videographicsitem.desktop | 11 +++++++++++ examples/multimedia/videowidget/videowidget.desktop | 11 +++++++++++ 5 files changed, 55 insertions(+) create mode 100644 examples/multimedia/audiodevices/audiodevices.desktop create mode 100644 examples/multimedia/audioinput/audioinput.desktop create mode 100644 examples/multimedia/audiooutput/audiooutput.desktop create mode 100644 examples/multimedia/videographicsitem/videographicsitem.desktop create mode 100644 examples/multimedia/videowidget/videowidget.desktop diff --git a/examples/multimedia/audiodevices/audiodevices.desktop b/examples/multimedia/audiodevices/audiodevices.desktop new file mode 100644 index 00000000..ffff4b4f --- /dev/null +++ b/examples/multimedia/audiodevices/audiodevices.desktop @@ -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 diff --git a/examples/multimedia/audioinput/audioinput.desktop b/examples/multimedia/audioinput/audioinput.desktop new file mode 100644 index 00000000..0f1571e5 --- /dev/null +++ b/examples/multimedia/audioinput/audioinput.desktop @@ -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 diff --git a/examples/multimedia/audiooutput/audiooutput.desktop b/examples/multimedia/audiooutput/audiooutput.desktop new file mode 100644 index 00000000..147633fd --- /dev/null +++ b/examples/multimedia/audiooutput/audiooutput.desktop @@ -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 diff --git a/examples/multimedia/videographicsitem/videographicsitem.desktop b/examples/multimedia/videographicsitem/videographicsitem.desktop new file mode 100644 index 00000000..8d5d087b --- /dev/null +++ b/examples/multimedia/videographicsitem/videographicsitem.desktop @@ -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 diff --git a/examples/multimedia/videowidget/videowidget.desktop b/examples/multimedia/videowidget/videowidget.desktop new file mode 100644 index 00000000..9bc183da --- /dev/null +++ b/examples/multimedia/videowidget/videowidget.desktop @@ -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