From 3abaecc3aec4e46f1c5969c33875fd45aa542385 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 28 Apr 2011 19:39:11 +0200 Subject: Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). --- examples/xmlpatterns/filetree/filetree.desktop | 11 ++ examples/xmlpatterns/filetree/filetree.pro | 5 + .../qobjectxmlmodel/qobjectxmlmodel.desktop | 11 ++ .../qobjectxmlmodel/qobjectxmlmodel.pro | 5 + .../recipes/forms/querywidget_mobiles.ui | 87 ++++++++++++++ examples/xmlpatterns/recipes/main.cpp | 4 + examples/xmlpatterns/recipes/querymainwindow.h | 6 +- examples/xmlpatterns/recipes/recipes.desktop | 11 ++ examples/xmlpatterns/recipes/recipes.pro | 5 +- examples/xmlpatterns/schema/main.cpp | 4 + examples/xmlpatterns/schema/mainwindow.h | 6 +- examples/xmlpatterns/schema/schema.desktop | 11 ++ examples/xmlpatterns/schema/schema.pro | 4 +- examples/xmlpatterns/schema/schema_mobiles.ui | 130 +++++++++++++++++++++ .../xmlpatterns/trafficinfo/trafficinfo.desktop | 11 ++ examples/xmlpatterns/trafficinfo/trafficinfo.pro | 5 + examples/xmlpatterns/xmlpatterns.pro | 1 - .../xquery/globalVariables/globalVariables.desktop | 11 ++ .../xquery/globalVariables/globalVariables.pro | 1 - examples/xmlpatterns/xquery/xquery.pro | 2 + 20 files changed, 325 insertions(+), 6 deletions(-) create mode 100644 examples/xmlpatterns/filetree/filetree.desktop create mode 100644 examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.desktop create mode 100644 examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui create mode 100644 examples/xmlpatterns/recipes/recipes.desktop create mode 100644 examples/xmlpatterns/schema/schema.desktop create mode 100644 examples/xmlpatterns/schema/schema_mobiles.ui create mode 100644 examples/xmlpatterns/trafficinfo/trafficinfo.desktop create mode 100644 examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop (limited to 'examples/xmlpatterns') diff --git a/examples/xmlpatterns/filetree/filetree.desktop b/examples/xmlpatterns/filetree/filetree.desktop new file mode 100644 index 0000000000..b11e0de84c --- /dev/null +++ b/examples/xmlpatterns/filetree/filetree.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=File System +Exec=/opt/usr/bin/filetree +Icon=filetree +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro index 4fcf7cb16c..e99c097cc4 100644 --- a/examples/xmlpatterns/filetree/filetree.pro +++ b/examples/xmlpatterns/filetree/filetree.pro @@ -15,3 +15,8 @@ symbian { TARGET.UID3 = 0xA000D7C4 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +symbian: warning(This example might not fully work on Symbian platform) +maemo5: warning(This example might not fully work on Maemo platform) +simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.desktop b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.desktop new file mode 100644 index 0000000000..94e617ff66 --- /dev/null +++ b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=QObject XML Model +Exec=/opt/usr/bin/qobjectxmlmodel +Icon=qobjectxmlmodel +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro index 5a63b2bbb5..7581690758 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro +++ b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro @@ -16,3 +16,8 @@ symbian { TARGET.UID3 = 0xA000D7C8 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +symbian: warning(This example might not fully work on Symbian platform) +maemo5: warning(This example might not fully work on Maemo platform) +simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui b/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui new file mode 100644 index 0000000000..bdb0817edd --- /dev/null +++ b/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui @@ -0,0 +1,87 @@ + + + QueryWidget + + + + 0 + 0 + 453 + 583 + + + + Recipes XQuery Example + + + + + + + 0 + + + false + + + + Input Document + + + + + + Qt::NoTextInteraction + + + false + + + + + + + + Query selection + + + + + + + + + Qt::NoTextInteraction + + + false + + + + + + + + Ouput Document + + + + + + Qt::NoTextInteraction + + + false + + + + + + + + + + + + + diff --git a/examples/xmlpatterns/recipes/main.cpp b/examples/xmlpatterns/recipes/main.cpp index cf679f5af8..2ff24608f4 100644 --- a/examples/xmlpatterns/recipes/main.cpp +++ b/examples/xmlpatterns/recipes/main.cpp @@ -47,7 +47,11 @@ int main(int argc, char* argv[]) Q_INIT_RESOURCE(recipes); QApplication app(argc, argv); QueryMainWindow* const queryWindow = new QueryMainWindow; +#ifdef Q_OS_SYMBIAN + queryWindow->showMaximized(); +#else queryWindow->show(); +#endif return app.exec(); } //! [0] diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 675b047629..57666b6504 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -43,7 +43,11 @@ #include -#include "ui_querywidget.h" +#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) + #include "ui_querywidget_mobiles.h" +#else + #include "ui_querywidget.h" +#endif QT_BEGIN_NAMESPACE class QComboBox; diff --git a/examples/xmlpatterns/recipes/recipes.desktop b/examples/xmlpatterns/recipes/recipes.desktop new file mode 100644 index 0000000000..db909724c4 --- /dev/null +++ b/examples/xmlpatterns/recipes/recipes.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=Recipes +Exec=/opt/usr/bin/recipes +Icon=recipes +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro index 67d6d73401..93203ae556 100644 --- a/examples/xmlpatterns/recipes/recipes.pro +++ b/examples/xmlpatterns/recipes/recipes.pro @@ -1,5 +1,6 @@ QT += xmlpatterns -FORMS += forms/querywidget.ui +FORMS += forms/querywidget.ui \ + forms/querywidget_mobiles.ui HEADERS = querymainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = recipes.qrc SOURCES = main.cpp querymainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp @@ -14,3 +15,5 @@ symbian { TARGET.UID3 = 0xA000D7C5 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/xmlpatterns/schema/main.cpp b/examples/xmlpatterns/schema/main.cpp index d501b5f6fe..fc5f40dfb3 100644 --- a/examples/xmlpatterns/schema/main.cpp +++ b/examples/xmlpatterns/schema/main.cpp @@ -47,7 +47,11 @@ int main(int argc, char* argv[]) Q_INIT_RESOURCE(schema); QApplication app(argc, argv); MainWindow* const window = new MainWindow; +#ifdef Q_OS_SYMBIAN + window->showMaximized(); +#else window->show(); +#endif return app.exec(); } //! [0] diff --git a/examples/xmlpatterns/schema/mainwindow.h b/examples/xmlpatterns/schema/mainwindow.h index 2bec81dd0f..a5948b52f7 100644 --- a/examples/xmlpatterns/schema/mainwindow.h +++ b/examples/xmlpatterns/schema/mainwindow.h @@ -43,7 +43,11 @@ #include -#include "ui_schema.h" +#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) + #include "ui_schema_mobiles.h" +#else + #include "ui_schema.h" +#endif //! [0] class MainWindow : public QMainWindow, diff --git a/examples/xmlpatterns/schema/schema.desktop b/examples/xmlpatterns/schema/schema.desktop new file mode 100644 index 0000000000..06d98e0294 --- /dev/null +++ b/examples/xmlpatterns/schema/schema.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=XML Schema Validation +Exec=/opt/usr/bin/schema +Icon=schema +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro index 4d3520c1a9..316359cccb 100644 --- a/examples/xmlpatterns/schema/schema.pro +++ b/examples/xmlpatterns/schema/schema.pro @@ -1,5 +1,5 @@ QT += xmlpatterns -FORMS += schema.ui +FORMS += schema.ui schema_mobiles.ui HEADERS = mainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = schema.qrc SOURCES = main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp @@ -14,3 +14,5 @@ symbian { TARGET.UID3 = 0xA000D7C6 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/xmlpatterns/schema/schema_mobiles.ui b/examples/xmlpatterns/schema/schema_mobiles.ui new file mode 100644 index 0000000000..009d0aaed8 --- /dev/null +++ b/examples/xmlpatterns/schema/schema_mobiles.ui @@ -0,0 +1,130 @@ + + + SchemaMainWindow + + + + 0 + 0 + 187 + 179 + + + + XML Schema Validation + + + + + QLayout::SetNoConstraint + + + + + 1 + + + + XML Schema + + + + + + + 0 + 0 + + + + 3 + + + + + + + + + + + XML Instance + + + + QLayout::SetNoConstraint + + + + + + 0 + 0 + + + + 3 + + + + + + + + 0 + 0 + + + + + 8 + + + + false + + + + + + + + + + 0 + 0 + + + + Not validated + + + true + + + + + + + + 0 + 0 + + + + Validate + + + + + + + + + + + + + + + diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.desktop b/examples/xmlpatterns/trafficinfo/trafficinfo.desktop new file mode 100644 index 0000000000..246d34be4f --- /dev/null +++ b/examples/xmlpatterns/trafficinfo/trafficinfo.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=TrafficInfo +Exec=/opt/usr/bin/trafficinfo +Icon=trafficinfo +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro index 99825d0db9..db6b37ab71 100644 --- a/examples/xmlpatterns/trafficinfo/trafficinfo.pro +++ b/examples/xmlpatterns/trafficinfo/trafficinfo.pro @@ -12,3 +12,8 @@ symbian { TARGET.UID3 = 0xA000D7C7 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +symbian: warning(This example might not fully work on Symbian platform) +maemo5: warning(This example might not fully work on Maemo platform) +simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/xmlpatterns/xmlpatterns.pro index 2ad4798ff9..35ca4d56da 100644 --- a/examples/xmlpatterns/xmlpatterns.pro +++ b/examples/xmlpatterns/xmlpatterns.pro @@ -14,4 +14,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlpatterns.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff --git a/examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop b/examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop new file mode 100644 index 0000000000..d2f505564f --- /dev/null +++ b/examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=C++ Source Code Analyzer +Exec=/opt/usr/bin/globalVariables +Icon=globalVariables +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro index 8520606bbe..b32613bae9 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro +++ b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro @@ -8,4 +8,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.cpp *.pro *.xq *.html sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/xquery/globalVariables INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro index 70b215c8b0..67818740a8 100644 --- a/examples/xmlpatterns/xquery/xquery.pro +++ b/examples/xmlpatterns/xquery/xquery.pro @@ -8,3 +8,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/xquery INSTALLS += target sources symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + -- cgit v1.2.1