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 /examples/svg/embedded/fluidlauncher/demoapplication.cpp | |
| parent | 704d8095d6a85653464dcda25e31f2e0724c131d (diff) | |
| parent | cc8379cfbbaa0a4e2a04f68712afdb6597cb10f3 (diff) | |
| download | qtsvg-50aa9da79f8ec06f4c53ce1231021be2000684f8.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7d863f4b9921018cd64a56b427bbd3ef36622932
Diffstat (limited to 'examples/svg/embedded/fluidlauncher/demoapplication.cpp')
| -rw-r--r-- | examples/svg/embedded/fluidlauncher/demoapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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() |