From: David Boddie Date: Wed, 27 Apr 2011 17:16:41 +0000 (+0200) Subject: Squashed commit of the changes from the mobile-examples repository X-Git-Tag: 1.0_branch~85^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c9c8af24d4265f780b2f53468735556bcbae91a;p=profile%2Fivi%2Fqtxmlpatterns.git Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44) --- diff --git a/doc/src/examples/recipes.qdoc b/doc/src/examples/recipes.qdoc index f34fe3b..8e9619a 100644 --- a/doc/src/examples/recipes.qdoc +++ b/doc/src/examples/recipes.qdoc @@ -29,7 +29,7 @@ \example xmlpatterns/recipes \title Recipes Example - The recipes example shows how to use QtXmlPatterns to query XML data + The Recipes example shows how to use QtXmlPatterns to query XML data loaded from a file. \tableofcontents diff --git a/doc/src/examples/schema.qdoc b/doc/src/examples/schema.qdoc index 1cc4ed3..3fab7d6 100644 --- a/doc/src/examples/schema.qdoc +++ b/doc/src/examples/schema.qdoc @@ -29,8 +29,8 @@ \example xmlpatterns/schema \title XML Schema Validation Example - This example shows how to use QtXmlPatterns to validate XML with - a W3C XML Schema. + The XML Schema Validation example shows how to use QtXmlPatterns to + validate XML with a W3C XML Schema. \tableofcontents diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro index 0ba5621..943030b 100644 --- a/examples/xmlpatterns/filetree/filetree.pro +++ b/examples/xmlpatterns/filetree/filetree.pro @@ -15,3 +15,8 @@ symbian { TARGET.UID3 = 0xA000D7C4 CONFIG += qt_example } +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/main.cpp b/examples/xmlpatterns/recipes/main.cpp index cf679f5..2ff2460 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 675b047..57666b6 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.pro b/examples/xmlpatterns/recipes/recipes.pro index 8c39bbe..ef01132 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 CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/xmlpatterns/schema/main.cpp b/examples/xmlpatterns/schema/main.cpp index d501b5f..fc5f40d 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 2bec81d..a5948b5 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.pro b/examples/xmlpatterns/schema/schema.pro index 204d2e0..6fa16ef 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 CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro index c9c0bbe..33ddc78 100644 --- a/examples/xmlpatterns/trafficinfo/trafficinfo.pro +++ b/examples/xmlpatterns/trafficinfo/trafficinfo.pro @@ -12,3 +12,8 @@ symbian { TARGET.UID3 = 0xA000D7C7 CONFIG += qt_example } +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/xquery/globalVariables/globalVariables.pro b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro index 669b0f7..b5c695d 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro +++ b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro @@ -9,3 +9,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery/globalVa INSTALLS += target sources symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro index f0f1a0c..5e5c4fa 100644 --- a/examples/xmlpatterns/xquery/xquery.pro +++ b/examples/xmlpatterns/xquery/xquery.pro @@ -8,3 +8,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery INSTALLS += target sources symbian: CONFIG += qt_example +maemo5: CONFIG += qt_example