diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:58:39 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:58:39 +0100 |
commit | ed570c4835034bbdf36b74731da3d937d3063285 (patch) | |
tree | 272c576c02069506e90b7c219da19a575c43b14b /tests/auto/guiapplauncher | |
parent | 8171769a728b094e1996a3449ce2d63230c4704a (diff) | |
parent | 1fb79c9f2b50294b989cf2bdd8bfaaf0a458e2a8 (diff) | |
download | qtsvg-ed570c4835034bbdf36b74731da3d937d3063285.tar.gz |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
LICENSE.GPLv2
Change-Id: Id7e321e81c3b3af0c17c9d32d25c0bb905974728
Diffstat (limited to 'tests/auto/guiapplauncher')
-rw-r--r-- | tests/auto/guiapplauncher/examples.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt index f661074..faa7f06 100644 --- a/tests/auto/guiapplauncher/examples.txt +++ b/tests/auto/guiapplauncher/examples.txt @@ -1,2 +1,10 @@ -"painting/svggenerator Example", "examples/painting/svggenerator", "svggenerator", 10, -1 -"painting/svgviewer Example", "examples/painting/svgviewer", "svgviewer", 0, -1 +"svg/svgviewer Example", "examples/svg/svgviewer", "svgviewer", 0, -1 +"svg/svggenerator Example", "examples/svg/svggenerator", "svggenerator", 10, -1 +"svg/embedded/weatherinfo Example", "examples/svg/embedded/weatherinfo", "weatherinfo", 0, -1 +"svg/embedded/desktopservices Example", "examples/svg/embedded/desktopservices", "desktopservices", 10, -1 +"svg/embedded/fluidlauncher Example", "examples/svg/embedded/fluidlauncher", "fluidlauncher", 10, -1 +"svg/draganddrop/delayedencoding Example", "examples/svg/draganddrop/delayedencoding", "delayedencoding", 0, -1 +"svg/opengl/framebufferobject Example", "examples/svg/opengl/framebufferobject", "framebufferobject", 10, -1 +"svg/richtext/textobject Example", "examples/svg/richtext/textobject", "textobject", 0, -1 +"svg/embeddedsvgviewer Example", "examples/svg/embeddedsvgviewer", "embeddedsvgviewer", 10, -1 +"svg/network/bearercloud Example", "examples/svg/network/bearercloud", "bearercloud", 0, -1 |