diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:34:01 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:34:01 +0200 |
commit | 50aa9da79f8ec06f4c53ce1231021be2000684f8 (patch) | |
tree | 760fccd958af189efc957b8013c76e4681db54e9 | |
parent | 704d8095d6a85653464dcda25e31f2e0724c131d (diff) | |
parent | cc8379cfbbaa0a4e2a04f68712afdb6597cb10f3 (diff) | |
download | qtsvg-50aa9da79f8ec06f4c53ce1231021be2000684f8.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7d863f4b9921018cd64a56b427bbd3ef36622932
4 files changed, 6 insertions, 39 deletions
diff --git a/examples/svg/embedded/fluidlauncher/config_s60/config.xml b/examples/svg/embedded/fluidlauncher/config_s60/config.xml deleted file mode 100644 index 4f10488..0000000 --- a/examples/svg/embedded/fluidlauncher/config_s60/config.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<demolauncher> - <demos> - <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer_s60.png" args="/data/images/qt/demos/embeddedsvgviewer/shapes.svg"/> - <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo_s60.png"/> - <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/> - <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/> - <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/> - <example filename="qftp" name="Ftp Client" image="screenshots/ftp_s60.png"/> - <example filename="context2d" name="Context2d" image="screenshots/context2d_s60.png" args="-small-screen"/> - <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/> - <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices_s60.png"/> - <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/> - <example filename="softkeys" name="Softkeys" image="screenshots/softkeys_s60.png"/> - <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/> - <example filename="raycasting" name="Ray casting" image="screenshots/raycasting.png"/> - <example filename="lightmaps" name="OpenStreetMap" image="screenshots/lightmaps.png"/> - <example filename="flightinfo" name="Flight Info" image="screenshots/flightinfo_s60.png"/> - <example filename="weatherinfo" name="Weather Info" image="screenshots/weatherinfo.png"/> - <example filename="flickable" name="Kinetic Scrolling" image="screenshots/flickable.png"/> - <example filename="digiflip" name="Flipping Clock" image="screenshots/digiflip.png"/> - <example filename="qmediaplayer" name="Media Player" image="screenshots/mediaplayer.png" args="-small-screen"/> - <example filename="spectrum" name="Spectrum Analyzer" image="screenshots/spectrum.png" args="-small-screen"/> - <example filename="qmlcalculator" name="Qml Calculator" image="screenshots/qmlcalculator.png"/> - <example filename="qmlclocks" name="Qml Clocks" image="screenshots/qmlclocks.png"/> - <example filename="qmldialcontrol" name="Qml Dial Control" image="screenshots/qmldialcontrol.png"/> - <example filename="qmleasing" name="Qml Easing Curves" image="screenshots/qmleasing.png"/> - <example filename="qmlflickr" name="Qml flickr" image="screenshots/qmlflickr.jpg"/> - <example filename="qmlphotoviewer" name="Qml Photo Viewer" image="screenshots/qmlphotoviewer.jpg"/> - <example filename="qmltwitter" name="Qml twitter" image="screenshots/qmltwitter.jpg"/> - </demos> - <slideshow timeout="60000" interval="10000"> - <imagedir dir="slides"/> - </slideshow> -</demolauncher> diff --git a/examples/svg/embedded/fluidlauncher/demoapplication.cpp b/examples/svg/embedded/fluidlauncher/demoapplication.cpp index ea7f5d6..a5d288f 100644 --- a/examples/svg/embedded/fluidlauncher/demoapplication.cpp +++ b/examples/svg/embedded/fluidlauncher/demoapplication.cpp @@ -75,9 +75,9 @@ void DemoApplication::launch() process.start(executablePath, arguments); } -QImage* DemoApplication::getImage() +QImage DemoApplication::getImage() const { - return new QImage(imagePath); + return imagePath.isEmpty() ? QImage() : QImage(imagePath); } QString DemoApplication::getCaption() diff --git a/examples/svg/embedded/fluidlauncher/demoapplication.h b/examples/svg/embedded/fluidlauncher/demoapplication.h index da12f05..9a1b2ac 100644 --- a/examples/svg/embedded/fluidlauncher/demoapplication.h +++ b/examples/svg/embedded/fluidlauncher/demoapplication.h @@ -54,7 +54,7 @@ class DemoApplication : public QObject public: DemoApplication(QString executableName, QString caption, QString imageName, QStringList args); void launch(); - QImage* getImage(); + QImage getImage() const; QString getCaption(); public slots: diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp index a5af617..81cd14d 100644 --- a/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp +++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp @@ -207,7 +207,9 @@ void FluidLauncher::populatePictureFlow() pictureFlowWidget->setSlideCount(demoList.count()); for (int i=demoList.count()-1; i>=0; --i) { - pictureFlowWidget->setSlide(i, *(demoList[i]->getImage())); + const QImage image = demoList[i]->getImage(); + if (!image.isNull()) + pictureFlowWidget->setSlide(i, image); pictureFlowWidget->setSlideCaption(i, demoList[i]->getCaption()); } |