diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 23:33:26 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 23:33:26 +1000 |
commit | 0aaa25052204cf2b6ee332cc15cfb6f9a737fa1a (patch) | |
tree | 65a36d36acc9bfb98329634447577e9365ab9823 | |
parent | 53379a432867addee542d4c2e7a99361ddce7a03 (diff) | |
parent | 32e6fcc2696a4b2bc1443449496d2a91913c5f90 (diff) | |
download | qtsvg-0aaa25052204cf2b6ee332cc15cfb6f9a737fa1a.tar.gz |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging:
More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)
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)
-rw-r--r-- | examples/desktop/systray/systray.pro | 5 | ||||
-rw-r--r-- | examples/draganddrop/delayedencoding/delayedencoding.pro | 9 | ||||
-rw-r--r-- | examples/draganddrop/delayedencoding/main.cpp | 4 | ||||
-rw-r--r-- | examples/draganddrop/delayedencoding/sourcewidget.cpp | 1 | ||||
-rw-r--r-- | examples/network/bearercloud/bearercloud.pro | 8 | ||||
-rw-r--r-- | examples/painting/svggenerator/main.cpp | 4 | ||||
-rw-r--r-- | examples/painting/svggenerator/svggenerator.desktop | 11 | ||||
-rw-r--r-- | examples/painting/svggenerator/svggenerator.pro | 2 | ||||
-rw-r--r-- | examples/painting/svggenerator/window.cpp | 4 | ||||
-rw-r--r-- | examples/painting/svgviewer/main.cpp | 4 | ||||
-rw-r--r-- | examples/painting/svgviewer/svgviewer.desktop | 11 | ||||
-rw-r--r-- | examples/painting/svgviewer/svgviewer.pro | 2 | ||||
-rw-r--r-- | examples/richtext/textobject/main.cpp | 6 | ||||
-rw-r--r-- | examples/richtext/textobject/resources.qrc | 5 | ||||
-rw-r--r-- | examples/richtext/textobject/textobject.desktop | 11 | ||||
-rw-r--r-- | examples/richtext/textobject/textobject.pro | 5 | ||||
-rw-r--r-- | examples/richtext/textobject/window.cpp | 2 |
17 files changed, 88 insertions, 6 deletions
diff --git a/examples/desktop/systray/systray.pro b/examples/desktop/systray/systray.pro index e36d4e7..76b2b7d 100644 --- a/examples/desktop/systray/systray.pro +++ b/examples/desktop/systray/systray.pro @@ -22,3 +22,8 @@ wince* { addPlugins.path = imageformats DEPLOYMENT += addPlugins } + +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) +symbian: warning(This example does not work on Symbian platform) +maemo5: warning(This example does not work on Maemo platform) +simulator: warning(This example does not work on Simulator platform) diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro index e3805a8..e632503 100644 --- a/examples/draganddrop/delayedencoding/delayedencoding.pro +++ b/examples/draganddrop/delayedencoding/delayedencoding.pro @@ -13,4 +13,11 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/itemviews/delayedencoding INSTALLS += target sources -symbian:TARGET.UID3 = 0xA000C614
\ No newline at end of file +symbian { + TARGET.UID3 = 0xA000C614 + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +} +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) +symbian: warning(This example does not work on Symbian platform) +maemo5: warning(This example does not work on Maemo platform) +simulator: warning(This example does not work on Simulator platform) diff --git a/examples/draganddrop/delayedencoding/main.cpp b/examples/draganddrop/delayedencoding/main.cpp index a8d8e53..b1fa160 100644 --- a/examples/draganddrop/delayedencoding/main.cpp +++ b/examples/draganddrop/delayedencoding/main.cpp @@ -45,7 +45,11 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); SourceWidget window; +#ifdef Q_OS_SYMBIAN + window.showMaximized(); +#else window.show(); +#endif return app.exec(); } diff --git a/examples/draganddrop/delayedencoding/sourcewidget.cpp b/examples/draganddrop/delayedencoding/sourcewidget.cpp index 9620502..0fbeb11 100644 --- a/examples/draganddrop/delayedencoding/sourcewidget.cpp +++ b/examples/draganddrop/delayedencoding/sourcewidget.cpp @@ -60,6 +60,7 @@ SourceWidget::SourceWidget(QWidget *parent) QLabel *instructTopLabel = new QLabel(tr("This is an SVG drawing:")); QLabel *instructBottomLabel = new QLabel( tr("Drag the icon to copy the drawing as a PNG file:")); + instructBottomLabel->setWordWrap(true); QPushButton *dragIcon = new QPushButton(tr("Export")); dragIcon->setIcon(QIcon(":/images/drag.png")); diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro index c07626a..ff3f917 100644 --- a/examples/network/bearercloud/bearercloud.pro +++ b/examples/network/bearercloud/bearercloud.pro @@ -13,4 +13,10 @@ QT = core gui network svg CONFIG += console -symbian:TARGET.CAPABILITY = NetworkServices ReadUserData +symbian: { + TARGET.CAPABILITY = NetworkServices ReadUserData + 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) diff --git a/examples/painting/svggenerator/main.cpp b/examples/painting/svggenerator/main.cpp index f2079f5..4a43828 100644 --- a/examples/painting/svggenerator/main.cpp +++ b/examples/painting/svggenerator/main.cpp @@ -46,6 +46,10 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; +#if defined(Q_OS_SYMBIAN) + window.showMaximized(); +#else window.show(); +#endif return app.exec(); } diff --git a/examples/painting/svggenerator/svggenerator.desktop b/examples/painting/svggenerator/svggenerator.desktop new file mode 100644 index 0000000..3ae32a4 --- /dev/null +++ b/examples/painting/svggenerator/svggenerator.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=SVG Generator +Exec=/opt/usr/bin/svggenerator +Icon=svggenerator +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/painting/svggenerator/svggenerator.pro b/examples/painting/svggenerator/svggenerator.pro index ecbdd03..4b72688 100644 --- a/examples/painting/svggenerator/svggenerator.pro +++ b/examples/painting/svggenerator/svggenerator.pro @@ -20,3 +20,5 @@ symbian { TARGET.UID3 = 0xA000CF68 CONFIG += qt_example } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/painting/svggenerator/window.cpp b/examples/painting/svggenerator/window.cpp index f3e950e..eb3d1b4 100644 --- a/examples/painting/svggenerator/window.cpp +++ b/examples/painting/svggenerator/window.cpp @@ -49,6 +49,10 @@ Window::Window(QWidget *parent) : QWidget(parent) { setupUi(this); + +#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) + this->layout()->setSizeConstraint(QLayout::SetDefaultConstraint); +#endif } void Window::updateBackground(int background) diff --git a/examples/painting/svgviewer/main.cpp b/examples/painting/svgviewer/main.cpp index de5cc09..bad6cd5 100644 --- a/examples/painting/svgviewer/main.cpp +++ b/examples/painting/svgviewer/main.cpp @@ -57,6 +57,10 @@ int main(int argc, char **argv) window.openFile(argv[1]); else window.openFile(":/files/bubbles.svg"); +#if defined(Q_OS_SYMBIAN) + window.showMaximized(); +#else window.show(); +#endif return app.exec(); } diff --git a/examples/painting/svgviewer/svgviewer.desktop b/examples/painting/svgviewer/svgviewer.desktop new file mode 100644 index 0000000..477ef78 --- /dev/null +++ b/examples/painting/svgviewer/svgviewer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=SVG Viewer +Exec=/opt/usr/bin/svgviewer +Icon=svgviewer +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro index e262383..cfcc4aa 100644 --- a/examples/painting/svgviewer/svgviewer.pro +++ b/examples/painting/svgviewer/svgviewer.pro @@ -29,3 +29,5 @@ symbian: { addFiles.path = . DEPLOYMENT += addFiles } +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + diff --git a/examples/richtext/textobject/main.cpp b/examples/richtext/textobject/main.cpp index 2b95252..1d1d433 100644 --- a/examples/richtext/textobject/main.cpp +++ b/examples/richtext/textobject/main.cpp @@ -47,8 +47,10 @@ int main(int argv, char **args) QApplication app(argv, args); Window window; +#if defined(Q_OS_SYMBIAN) + window.showMaximized(); +#else window.show(); - +#endif return app.exec(); } - diff --git a/examples/richtext/textobject/resources.qrc b/examples/richtext/textobject/resources.qrc new file mode 100644 index 0000000..39b2f5d --- /dev/null +++ b/examples/richtext/textobject/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>files/heart.svg</file> + </qresource> +</RCC> diff --git a/examples/richtext/textobject/textobject.desktop b/examples/richtext/textobject/textobject.desktop new file mode 100644 index 0000000..1b0980f --- /dev/null +++ b/examples/richtext/textobject/textobject.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Name=Text Object +Exec=/opt/usr/bin/textobject +Icon=textobject +X-Window-Icon= +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro index 70ed427..9e7b23b 100644 --- a/examples/richtext/textobject/textobject.pro +++ b/examples/richtext/textobject/textobject.pro @@ -6,13 +6,16 @@ SOURCES = main.cpp \ QT += svg +RESOURCES = resources.qrc + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject INSTALLS += target sources +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) filesToDeploy.files = files/*.svg filesToDeploy.path = files DEPLOYMENT += filesToDeploy - diff --git a/examples/richtext/textobject/window.cpp b/examples/richtext/textobject/window.cpp index 7feb918..e43ac28 100644 --- a/examples/richtext/textobject/window.cpp +++ b/examples/richtext/textobject/window.cpp @@ -96,7 +96,7 @@ void Window::setupGui() fileNameLineEdit = new QLineEdit; insertTextObjectButton = new QPushButton(tr("Insert Image")); - fileNameLineEdit->setText("./files/heart.svg"); + fileNameLineEdit->setText(":/files/heart.svg"); connect(insertTextObjectButton, SIGNAL(clicked()), this, SLOT(insertTextObject())); |