diff options
-rw-r--r-- | .qmake.conf | 1 | ||||
-rw-r--r-- | examples/draganddrop/draganddrop.pro | 8 | ||||
-rw-r--r-- | examples/embedded/weatherinfo/weatherinfo.pro | 11 | ||||
-rw-r--r-- | examples/examples.pro | 5 | ||||
-rw-r--r-- | examples/network/network.pro | 8 | ||||
-rw-r--r-- | examples/opengl/framebufferobject/framebufferobject.pro | 11 | ||||
-rw-r--r-- | examples/opengl/opengl.pro | 8 | ||||
-rw-r--r-- | examples/richtext/richtext.pro | 8 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/delayedencoding.pro (renamed from examples/draganddrop/delayedencoding/delayedencoding.pro) | 6 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/delayedencoding.qrc (renamed from examples/draganddrop/delayedencoding/delayedencoding.qrc) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/images/drag.png (renamed from examples/draganddrop/delayedencoding/images/drag.png) | bin | 977 -> 977 bytes | |||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/images/example.svg (renamed from examples/draganddrop/delayedencoding/images/example.svg) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/main.cpp (renamed from examples/draganddrop/delayedencoding/main.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/mimedata.cpp (renamed from examples/draganddrop/delayedencoding/mimedata.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/mimedata.h (renamed from examples/draganddrop/delayedencoding/mimedata.h) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/sourcewidget.cpp (renamed from examples/draganddrop/delayedencoding/sourcewidget.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/delayedencoding/sourcewidget.h (renamed from examples/draganddrop/delayedencoding/sourcewidget.h) | 0 | ||||
-rw-r--r-- | examples/svg/draganddrop/draganddrop.pro | 3 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/contenttab.cpp (renamed from examples/embedded/desktopservices/contenttab.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/contenttab.h (renamed from examples/embedded/desktopservices/contenttab.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/data/Explosion.wav (renamed from examples/embedded/desktopservices/data/Explosion.wav) | bin | 18427 -> 18427 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/data/designer.png (renamed from examples/embedded/desktopservices/data/designer.png) | bin | 2529 -> 2529 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/data/monkey_on_64x64.png (renamed from examples/embedded/desktopservices/data/monkey_on_64x64.png) | bin | 3479 -> 3479 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/data/sax.mp3 (renamed from examples/embedded/desktopservices/data/sax.mp3) | bin | 104104 -> 104104 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/desktopservices.pro (renamed from examples/embedded/desktopservices/desktopservices.pro) | 8 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/desktopservices.qrc (renamed from examples/embedded/desktopservices/desktopservices.qrc) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/desktopwidget.cpp (renamed from examples/embedded/desktopservices/desktopwidget.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/desktopwidget.h (renamed from examples/embedded/desktopservices/desktopwidget.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/linktab.cpp (renamed from examples/embedded/desktopservices/linktab.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/linktab.h (renamed from examples/embedded/desktopservices/linktab.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/main.cpp (renamed from examples/embedded/desktopservices/main.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/resources/browser.png (renamed from examples/embedded/desktopservices/resources/browser.png) | bin | 2525 -> 2525 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/resources/heart.svg (renamed from examples/embedded/desktopservices/resources/heart.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/resources/message.png (renamed from examples/embedded/desktopservices/resources/message.png) | bin | 1989 -> 1989 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/resources/music.png (renamed from examples/embedded/desktopservices/resources/music.png) | bin | 2123 -> 2123 bytes | |||
-rw-r--r-- | examples/svg/embedded/desktopservices/resources/photo.png (renamed from examples/embedded/desktopservices/resources/photo.png) | bin | 2233 -> 2233 bytes | |||
-rw-r--r-- | examples/svg/embedded/embedded.pro (renamed from examples/embedded/embedded.pro) | 5 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/backup_registration.xml (renamed from examples/embedded/fluidlauncher/backup_registration.xml) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/config.xml (renamed from examples/embedded/fluidlauncher/config.xml) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/config_s60/config.xml (renamed from examples/embedded/fluidlauncher/config_s60/config.xml) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/config_wince/config.xml (renamed from examples/embedded/fluidlauncher/config_wince/config.xml) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/demoapplication.cpp (renamed from examples/embedded/fluidlauncher/demoapplication.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/demoapplication.h (renamed from examples/embedded/fluidlauncher/demoapplication.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/fluidlauncher.cpp (renamed from examples/embedded/fluidlauncher/fluidlauncher.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/fluidlauncher.h (renamed from examples/embedded/fluidlauncher/fluidlauncher.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/fluidlauncher.pro (renamed from examples/embedded/fluidlauncher/fluidlauncher.pro) | 7 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/main.cpp (renamed from examples/embedded/fluidlauncher/main.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/pictureflow.cpp (renamed from examples/embedded/fluidlauncher/pictureflow.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/pictureflow.h (renamed from examples/embedded/fluidlauncher/pictureflow.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/anomaly_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/anomaly_s60.png) | bin | 39093 -> 39093 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/concentriccircles.png (renamed from examples/embedded/fluidlauncher/screenshots/concentriccircles.png) | bin | 29623 -> 29623 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/context2d_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/context2d_s60.png) | bin | 39185 -> 39185 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/deform.png (renamed from examples/embedded/fluidlauncher/screenshots/deform.png) | bin | 18393 -> 18393 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/desktopservices_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png) | bin | 31504 -> 31504 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/digiflip.png (renamed from examples/embedded/fluidlauncher/screenshots/digiflip.png) | bin | 2039 -> 2039 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/elasticnodes.png (renamed from examples/embedded/fluidlauncher/screenshots/elasticnodes.png) | bin | 13312 -> 13312 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png (renamed from examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png) | bin | 7482 -> 7482 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png) | bin | 29917 -> 29917 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/flickable.png (renamed from examples/embedded/fluidlauncher/screenshots/flickable.png) | bin | 14141 -> 14141 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/flightinfo_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png) | bin | 20482 -> 20482 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png) | bin | 39865 -> 39865 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/ftp_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/ftp_s60.png) | bin | 32534 -> 32534 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/lightmaps.png (renamed from examples/embedded/fluidlauncher/screenshots/lightmaps.png) | bin | 79501 -> 79501 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/mediaplayer.png (renamed from examples/embedded/fluidlauncher/screenshots/mediaplayer.png) | bin | 80411 -> 80411 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/pathstroke.png (renamed from examples/embedded/fluidlauncher/screenshots/pathstroke.png) | bin | 14216 -> 14216 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmlcalculator.png (renamed from examples/embedded/fluidlauncher/screenshots/qmlcalculator.png) | bin | 15455 -> 15455 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmlclocks.png (renamed from examples/embedded/fluidlauncher/screenshots/qmlclocks.png) | bin | 12409 -> 12409 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmldialcontrol.png (renamed from examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png) | bin | 16811 -> 16811 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmleasing.png (renamed from examples/embedded/fluidlauncher/screenshots/qmleasing.png) | bin | 3453 -> 3453 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmlflickr.jpg (renamed from examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg) | bin | 35616 -> 35616 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg (renamed from examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg) | bin | 24216 -> 24216 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/qmltwitter.jpg (renamed from examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg) | bin | 35159 -> 35159 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/raycasting.png (renamed from examples/embedded/fluidlauncher/screenshots/raycasting.png) | bin | 11984 -> 11984 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png) | bin | 47182 -> 47182 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/softkeys_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/softkeys_s60.png) | bin | 28562 -> 28562 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/spectrum.png (renamed from examples/embedded/fluidlauncher/screenshots/spectrum.png) | bin | 21771 -> 21771 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/styledemo.png (renamed from examples/embedded/fluidlauncher/screenshots/styledemo.png) | bin | 26891 -> 26891 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/styledemo_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/styledemo_s60.png) | bin | 51957 -> 51957 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/weatherinfo.png (renamed from examples/embedded/fluidlauncher/screenshots/weatherinfo.png) | bin | 34472 -> 34472 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/wiggly.png (renamed from examples/embedded/fluidlauncher/screenshots/wiggly.png) | bin | 6546 -> 6546 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/screenshots/wiggly_s60.png (renamed from examples/embedded/fluidlauncher/screenshots/wiggly_s60.png) | bin | 5549 -> 5549 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slides/demo_1.png (renamed from examples/embedded/fluidlauncher/slides/demo_1.png) | bin | 20560 -> 20560 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slides/demo_2.png (renamed from examples/embedded/fluidlauncher/slides/demo_2.png) | bin | 5209 -> 5209 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slides/demo_3.png (renamed from examples/embedded/fluidlauncher/slides/demo_3.png) | bin | 19791 -> 19791 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slides/demo_4.png (renamed from examples/embedded/fluidlauncher/slides/demo_4.png) | bin | 5505 -> 5505 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slides/demo_5.png (renamed from examples/embedded/fluidlauncher/slides/demo_5.png) | bin | 6130 -> 6130 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slides/demo_6.png (renamed from examples/embedded/fluidlauncher/slides/demo_6.png) | bin | 5826 -> 5826 bytes | |||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slideshow.cpp (renamed from examples/embedded/fluidlauncher/slideshow.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slideshow.h (renamed from examples/embedded/fluidlauncher/slideshow.h) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/README.txt (renamed from examples/embedded/weatherinfo/icons/README.txt) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-few-clouds.svg (renamed from examples/embedded/weatherinfo/icons/weather-few-clouds.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-fog.svg (renamed from examples/embedded/weatherinfo/icons/weather-fog.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-haze.svg (renamed from examples/embedded/weatherinfo/icons/weather-haze.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-icy.svg (renamed from examples/embedded/weatherinfo/icons/weather-icy.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-overcast.svg (renamed from examples/embedded/weatherinfo/icons/weather-overcast.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-showers.svg (renamed from examples/embedded/weatherinfo/icons/weather-showers.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-sleet.svg (renamed from examples/embedded/weatherinfo/icons/weather-sleet.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-snow.svg (renamed from examples/embedded/weatherinfo/icons/weather-snow.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-storm.svg (renamed from examples/embedded/weatherinfo/icons/weather-storm.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg (renamed from examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-sunny.svg (renamed from examples/embedded/weatherinfo/icons/weather-sunny.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/icons/weather-thundershower.svg (renamed from examples/embedded/weatherinfo/icons/weather-thundershower.svg) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/weatherinfo.cpp (renamed from examples/embedded/weatherinfo/weatherinfo.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/weatherinfo.pro | 9 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/weatherinfo.qrc (renamed from examples/embedded/weatherinfo/weatherinfo.qrc) | 0 | ||||
-rw-r--r-- | examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro | 6 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/bearercloud.cpp (renamed from examples/network/bearercloud/bearercloud.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/bearercloud.h (renamed from examples/network/bearercloud/bearercloud.h) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/bearercloud.pro (renamed from examples/network/bearercloud/bearercloud.pro) | 6 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/bluetooth.svg (renamed from examples/network/bearercloud/bluetooth.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cell.svg (renamed from examples/network/bearercloud/cell.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cloud.cpp (renamed from examples/network/bearercloud/cloud.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cloud.h (renamed from examples/network/bearercloud/cloud.h) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/gprs.svg (renamed from examples/network/bearercloud/gprs.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/icons.qrc (renamed from examples/network/bearercloud/icons.qrc) | 0 | ||||
-rwxr-xr-x | examples/svg/network/bearercloud/lan.svg (renamed from examples/network/bearercloud/lan.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/main.cpp (renamed from examples/network/bearercloud/main.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/umts.svg (renamed from examples/network/bearercloud/umts.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/unknown.svg (renamed from examples/network/bearercloud/unknown.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/wlan.svg (renamed from examples/network/bearercloud/wlan.svg) | 0 | ||||
-rw-r--r-- | examples/svg/network/network.pro | 3 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/bubbles.svg (renamed from examples/opengl/framebufferobject/bubbles.svg) | 0 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/designer.png (renamed from examples/opengl/framebufferobject/designer.png) | bin | 2810 -> 2810 bytes | |||
-rw-r--r-- | examples/svg/opengl/framebufferobject/framebufferobject.pro | 9 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/framebufferobject.qrc (renamed from examples/opengl/framebufferobject/framebufferobject.qrc) | 0 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/glwidget.cpp (renamed from examples/opengl/framebufferobject/glwidget.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/glwidget.h (renamed from examples/opengl/framebufferobject/glwidget.h) | 0 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/main.cpp (renamed from examples/opengl/framebufferobject/main.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/opengl/opengl.pro | 3 | ||||
-rw-r--r-- | examples/svg/richtext/richtext.pro | 3 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/files/heart.svg (renamed from examples/richtext/textobject/files/heart.svg) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/main.cpp (renamed from examples/richtext/textobject/main.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/resources.qrc (renamed from examples/richtext/textobject/resources.qrc) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/svgtextobject.cpp (renamed from examples/richtext/textobject/svgtextobject.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/svgtextobject.h (renamed from examples/richtext/textobject/svgtextobject.h) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/textobject.desktop (renamed from examples/richtext/textobject/textobject.desktop) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/textobject.pro (renamed from examples/richtext/textobject/textobject.pro) | 6 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/window.cpp (renamed from examples/richtext/textobject/window.cpp) | 0 | ||||
-rw-r--r-- | examples/svg/richtext/textobject/window.h (renamed from examples/richtext/textobject/window.h) | 0 | ||||
-rw-r--r-- | examples/svg/svg.pro | 8 | ||||
-rw-r--r-- | examples/svg/svggenerator/svggenerator.pro | 6 | ||||
-rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 6 |
142 files changed, 54 insertions, 100 deletions
diff --git a/.qmake.conf b/.qmake.conf index 42ba8e4..5de255c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,2 @@ load(qt_build_config) +CONFIG += qt_example_installs diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro deleted file mode 100644 index 75e3e99..0000000 --- a/examples/draganddrop/draganddrop.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += delayedencoding -QT+=widgets - -# install -sources.files = draganddrop.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop -INSTALLS += sources diff --git a/examples/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro deleted file mode 100644 index 4bed5d0..0000000 --- a/examples/embedded/weatherinfo/weatherinfo.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = weatherinfo -SOURCES = weatherinfo.cpp -RESOURCES = weatherinfo.qrc -QT += network svg - -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro icons -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo -INSTALLS += target sources -QT+=widgets diff --git a/examples/examples.pro b/examples/examples.pro index 30b113c..a138e83 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,2 @@ TEMPLATE = subdirs -SUBDIRS += embedded richtext draganddrop network svg - -contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2):SUBDIRS += opengl -QT+=widgets +SUBDIRS += svg diff --git a/examples/network/network.pro b/examples/network/network.pro deleted file mode 100644 index 0a65e40..0000000 --- a/examples/network/network.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += bearercloud -QT+=widgets - -# install -sources.files = network.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network -INSTALLS += sources diff --git a/examples/opengl/framebufferobject/framebufferobject.pro b/examples/opengl/framebufferobject/framebufferobject.pro deleted file mode 100644 index c53eb8a..0000000 --- a/examples/opengl/framebufferobject/framebufferobject.pro +++ /dev/null @@ -1,11 +0,0 @@ -QT += widgets opengl svg - -HEADERS += glwidget.h -SOURCES += glwidget.cpp main.cpp -RESOURCES += framebufferobject.qrc - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl/framebufferobject -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.png *.svg -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl/framebufferobject -INSTALLS += target sources diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro deleted file mode 100644 index 6f3d007..0000000 --- a/examples/opengl/opengl.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += framebufferobject -QT+=widgets - -# install -sources.files = opengl.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl -INSTALLS += sources diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro deleted file mode 100644 index 4262d78..0000000 --- a/examples/richtext/richtext.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += textobject -QT+=widgets - -# install -sources.files = richtext.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext -INSTALLS += sources diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/svg/draganddrop/delayedencoding/delayedencoding.pro index d0e6395..2cb82f5 100644 --- a/examples/draganddrop/delayedencoding/delayedencoding.pro +++ b/examples/svg/draganddrop/delayedencoding/delayedencoding.pro @@ -8,10 +8,8 @@ SOURCES = main.cpp \ sourcewidget.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop/delayedencoding -sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES images -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop/delayedencoding -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/draganddrop/delayedencoding +INSTALLS += target simulator: warning(This example does not work on Simulator platform) QT+=widgets diff --git a/examples/draganddrop/delayedencoding/delayedencoding.qrc b/examples/svg/draganddrop/delayedencoding/delayedencoding.qrc index 374f211..374f211 100644 --- a/examples/draganddrop/delayedencoding/delayedencoding.qrc +++ b/examples/svg/draganddrop/delayedencoding/delayedencoding.qrc diff --git a/examples/draganddrop/delayedencoding/images/drag.png b/examples/svg/draganddrop/delayedencoding/images/drag.png Binary files differindex dd795cf..dd795cf 100644 --- a/examples/draganddrop/delayedencoding/images/drag.png +++ b/examples/svg/draganddrop/delayedencoding/images/drag.png diff --git a/examples/draganddrop/delayedencoding/images/example.svg b/examples/svg/draganddrop/delayedencoding/images/example.svg index 89a9129..89a9129 100644 --- a/examples/draganddrop/delayedencoding/images/example.svg +++ b/examples/svg/draganddrop/delayedencoding/images/example.svg diff --git a/examples/draganddrop/delayedencoding/main.cpp b/examples/svg/draganddrop/delayedencoding/main.cpp index 6b6063b..6b6063b 100644 --- a/examples/draganddrop/delayedencoding/main.cpp +++ b/examples/svg/draganddrop/delayedencoding/main.cpp diff --git a/examples/draganddrop/delayedencoding/mimedata.cpp b/examples/svg/draganddrop/delayedencoding/mimedata.cpp index efa096e..efa096e 100644 --- a/examples/draganddrop/delayedencoding/mimedata.cpp +++ b/examples/svg/draganddrop/delayedencoding/mimedata.cpp diff --git a/examples/draganddrop/delayedencoding/mimedata.h b/examples/svg/draganddrop/delayedencoding/mimedata.h index 4d84bd0..4d84bd0 100644 --- a/examples/draganddrop/delayedencoding/mimedata.h +++ b/examples/svg/draganddrop/delayedencoding/mimedata.h diff --git a/examples/draganddrop/delayedencoding/sourcewidget.cpp b/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp index 0373edb..0373edb 100644 --- a/examples/draganddrop/delayedencoding/sourcewidget.cpp +++ b/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp diff --git a/examples/draganddrop/delayedencoding/sourcewidget.h b/examples/svg/draganddrop/delayedencoding/sourcewidget.h index ef2766a..ef2766a 100644 --- a/examples/draganddrop/delayedencoding/sourcewidget.h +++ b/examples/svg/draganddrop/delayedencoding/sourcewidget.h diff --git a/examples/svg/draganddrop/draganddrop.pro b/examples/svg/draganddrop/draganddrop.pro new file mode 100644 index 0000000..99fecb0 --- /dev/null +++ b/examples/svg/draganddrop/draganddrop.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +!contains(QT_CONFIG, no-widgets): SUBDIRS += delayedencoding +QT+=widgets diff --git a/examples/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp index 5c82611..5c82611 100644 --- a/examples/embedded/desktopservices/contenttab.cpp +++ b/examples/svg/embedded/desktopservices/contenttab.cpp diff --git a/examples/embedded/desktopservices/contenttab.h b/examples/svg/embedded/desktopservices/contenttab.h index 9f0a824..9f0a824 100644 --- a/examples/embedded/desktopservices/contenttab.h +++ b/examples/svg/embedded/desktopservices/contenttab.h diff --git a/examples/embedded/desktopservices/data/Explosion.wav b/examples/svg/embedded/desktopservices/data/Explosion.wav Binary files differindex 7b140b1..7b140b1 100644 --- a/examples/embedded/desktopservices/data/Explosion.wav +++ b/examples/svg/embedded/desktopservices/data/Explosion.wav diff --git a/examples/embedded/desktopservices/data/designer.png b/examples/svg/embedded/desktopservices/data/designer.png Binary files differindex 1485efa..1485efa 100644 --- a/examples/embedded/desktopservices/data/designer.png +++ b/examples/svg/embedded/desktopservices/data/designer.png diff --git a/examples/embedded/desktopservices/data/monkey_on_64x64.png b/examples/svg/embedded/desktopservices/data/monkey_on_64x64.png Binary files differindex 990f604..990f604 100644 --- a/examples/embedded/desktopservices/data/monkey_on_64x64.png +++ b/examples/svg/embedded/desktopservices/data/monkey_on_64x64.png diff --git a/examples/embedded/desktopservices/data/sax.mp3 b/examples/svg/embedded/desktopservices/data/sax.mp3 Binary files differindex d77c817..d77c817 100644 --- a/examples/embedded/desktopservices/data/sax.mp3 +++ b/examples/svg/embedded/desktopservices/data/sax.mp3 diff --git a/examples/embedded/desktopservices/desktopservices.pro b/examples/svg/embedded/desktopservices/desktopservices.pro index c8fc140..1410451 100644 --- a/examples/embedded/desktopservices/desktopservices.pro +++ b/examples/svg/embedded/desktopservices/desktopservices.pro @@ -5,12 +5,12 @@ SOURCES += desktopwidget.cpp contenttab.cpp linktab.cpp main.cpp RESOURCES += desktopservices.qrc +EXAMPLE_FILES += data + music.files = data/*.mp3 data/*.wav image.files = data/*.png -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro resources data -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices +target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/desktopservices wince*{ music.path = "\\My Documents\\My Music" @@ -18,4 +18,4 @@ wince*{ DEPLOYMENT += music image } -INSTALLS += target sources +INSTALLS += target diff --git a/examples/embedded/desktopservices/desktopservices.qrc b/examples/svg/embedded/desktopservices/desktopservices.qrc index 410175f..410175f 100644 --- a/examples/embedded/desktopservices/desktopservices.qrc +++ b/examples/svg/embedded/desktopservices/desktopservices.qrc diff --git a/examples/embedded/desktopservices/desktopwidget.cpp b/examples/svg/embedded/desktopservices/desktopwidget.cpp index 75cc249..75cc249 100644 --- a/examples/embedded/desktopservices/desktopwidget.cpp +++ b/examples/svg/embedded/desktopservices/desktopwidget.cpp diff --git a/examples/embedded/desktopservices/desktopwidget.h b/examples/svg/embedded/desktopservices/desktopwidget.h index 6c1539c..6c1539c 100644 --- a/examples/embedded/desktopservices/desktopwidget.h +++ b/examples/svg/embedded/desktopservices/desktopwidget.h diff --git a/examples/embedded/desktopservices/linktab.cpp b/examples/svg/embedded/desktopservices/linktab.cpp index 523a104..523a104 100644 --- a/examples/embedded/desktopservices/linktab.cpp +++ b/examples/svg/embedded/desktopservices/linktab.cpp diff --git a/examples/embedded/desktopservices/linktab.h b/examples/svg/embedded/desktopservices/linktab.h index 8d13475..8d13475 100644 --- a/examples/embedded/desktopservices/linktab.h +++ b/examples/svg/embedded/desktopservices/linktab.h diff --git a/examples/embedded/desktopservices/main.cpp b/examples/svg/embedded/desktopservices/main.cpp index 878d589..878d589 100644 --- a/examples/embedded/desktopservices/main.cpp +++ b/examples/svg/embedded/desktopservices/main.cpp diff --git a/examples/embedded/desktopservices/resources/browser.png b/examples/svg/embedded/desktopservices/resources/browser.png Binary files differindex 9ecda6b..9ecda6b 100644 --- a/examples/embedded/desktopservices/resources/browser.png +++ b/examples/svg/embedded/desktopservices/resources/browser.png diff --git a/examples/embedded/desktopservices/resources/heart.svg b/examples/svg/embedded/desktopservices/resources/heart.svg index ba5f050..ba5f050 100644 --- a/examples/embedded/desktopservices/resources/heart.svg +++ b/examples/svg/embedded/desktopservices/resources/heart.svg diff --git a/examples/embedded/desktopservices/resources/message.png b/examples/svg/embedded/desktopservices/resources/message.png Binary files differindex 78917c7..78917c7 100644 --- a/examples/embedded/desktopservices/resources/message.png +++ b/examples/svg/embedded/desktopservices/resources/message.png diff --git a/examples/embedded/desktopservices/resources/music.png b/examples/svg/embedded/desktopservices/resources/music.png Binary files differindex cc569cb..cc569cb 100644 --- a/examples/embedded/desktopservices/resources/music.png +++ b/examples/svg/embedded/desktopservices/resources/music.png diff --git a/examples/embedded/desktopservices/resources/photo.png b/examples/svg/embedded/desktopservices/resources/photo.png Binary files differindex ac81cf3..ac81cf3 100644 --- a/examples/embedded/desktopservices/resources/photo.png +++ b/examples/svg/embedded/desktopservices/resources/photo.png diff --git a/examples/embedded/embedded.pro b/examples/svg/embedded/embedded.pro index 07554b8..09cbcd2 100644 --- a/examples/embedded/embedded.pro +++ b/examples/svg/embedded/embedded.pro @@ -1,8 +1,3 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo QT+=widgets - -# install -sources.files = embedded.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded -INSTALLS += sources diff --git a/examples/embedded/fluidlauncher/backup_registration.xml b/examples/svg/embedded/fluidlauncher/backup_registration.xml index 794e11d..794e11d 100644 --- a/examples/embedded/fluidlauncher/backup_registration.xml +++ b/examples/svg/embedded/fluidlauncher/backup_registration.xml diff --git a/examples/embedded/fluidlauncher/config.xml b/examples/svg/embedded/fluidlauncher/config.xml index 6cb4be7..6cb4be7 100644 --- a/examples/embedded/fluidlauncher/config.xml +++ b/examples/svg/embedded/fluidlauncher/config.xml diff --git a/examples/embedded/fluidlauncher/config_s60/config.xml b/examples/svg/embedded/fluidlauncher/config_s60/config.xml index 4f10488..4f10488 100644 --- a/examples/embedded/fluidlauncher/config_s60/config.xml +++ b/examples/svg/embedded/fluidlauncher/config_s60/config.xml diff --git a/examples/embedded/fluidlauncher/config_wince/config.xml b/examples/svg/embedded/fluidlauncher/config_wince/config.xml index 3b57770..3b57770 100644 --- a/examples/embedded/fluidlauncher/config_wince/config.xml +++ b/examples/svg/embedded/fluidlauncher/config_wince/config.xml diff --git a/examples/embedded/fluidlauncher/demoapplication.cpp b/examples/svg/embedded/fluidlauncher/demoapplication.cpp index 96af4ae..96af4ae 100644 --- a/examples/embedded/fluidlauncher/demoapplication.cpp +++ b/examples/svg/embedded/fluidlauncher/demoapplication.cpp diff --git a/examples/embedded/fluidlauncher/demoapplication.h b/examples/svg/embedded/fluidlauncher/demoapplication.h index 20d22ac..20d22ac 100644 --- a/examples/embedded/fluidlauncher/demoapplication.h +++ b/examples/svg/embedded/fluidlauncher/demoapplication.h diff --git a/examples/embedded/fluidlauncher/fluidlauncher.cpp b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp index 60e788c..60e788c 100644 --- a/examples/embedded/fluidlauncher/fluidlauncher.cpp +++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp diff --git a/examples/embedded/fluidlauncher/fluidlauncher.h b/examples/svg/embedded/fluidlauncher/fluidlauncher.h index 8278971..8278971 100644 --- a/examples/embedded/fluidlauncher/fluidlauncher.h +++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.h diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro index 7ea5edc..cf82a54 100644 --- a/examples/embedded/fluidlauncher/fluidlauncher.pro +++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro @@ -15,11 +15,10 @@ SOURCES += \ pictureflow.cpp \ slideshow.cpp +EXAMPLE_FILES += config.xml screenshots slides -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/fluidlauncher +INSTALLS += target wince*{ QT += svg diff --git a/examples/embedded/fluidlauncher/main.cpp b/examples/svg/embedded/fluidlauncher/main.cpp index 565face..565face 100644 --- a/examples/embedded/fluidlauncher/main.cpp +++ b/examples/svg/embedded/fluidlauncher/main.cpp diff --git a/examples/embedded/fluidlauncher/pictureflow.cpp b/examples/svg/embedded/fluidlauncher/pictureflow.cpp index d0dfe87..d0dfe87 100644 --- a/examples/embedded/fluidlauncher/pictureflow.cpp +++ b/examples/svg/embedded/fluidlauncher/pictureflow.cpp diff --git a/examples/embedded/fluidlauncher/pictureflow.h b/examples/svg/embedded/fluidlauncher/pictureflow.h index 13e676b..13e676b 100644 --- a/examples/embedded/fluidlauncher/pictureflow.h +++ b/examples/svg/embedded/fluidlauncher/pictureflow.h diff --git a/examples/embedded/fluidlauncher/screenshots/anomaly_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/anomaly_s60.png Binary files differindex 8d537f4..8d537f4 100644 --- a/examples/embedded/fluidlauncher/screenshots/anomaly_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/anomaly_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/concentriccircles.png b/examples/svg/embedded/fluidlauncher/screenshots/concentriccircles.png Binary files differindex fd308b5..fd308b5 100644 --- a/examples/embedded/fluidlauncher/screenshots/concentriccircles.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/concentriccircles.png diff --git a/examples/embedded/fluidlauncher/screenshots/context2d_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/context2d_s60.png Binary files differindex 9c288c9..9c288c9 100644 --- a/examples/embedded/fluidlauncher/screenshots/context2d_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/context2d_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/deform.png b/examples/svg/embedded/fluidlauncher/screenshots/deform.png Binary files differindex c22f2ae..c22f2ae 100644 --- a/examples/embedded/fluidlauncher/screenshots/deform.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/deform.png diff --git a/examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/desktopservices_s60.png Binary files differindex 64018f4..64018f4 100644 --- a/examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/desktopservices_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/digiflip.png b/examples/svg/embedded/fluidlauncher/screenshots/digiflip.png Binary files differindex c31a6f8..c31a6f8 100644 --- a/examples/embedded/fluidlauncher/screenshots/digiflip.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/digiflip.png diff --git a/examples/embedded/fluidlauncher/screenshots/elasticnodes.png b/examples/svg/embedded/fluidlauncher/screenshots/elasticnodes.png Binary files differindex bc157e5..bc157e5 100644 --- a/examples/embedded/fluidlauncher/screenshots/elasticnodes.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/elasticnodes.png diff --git a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png Binary files differindex 522f13b..522f13b 100644 --- a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png diff --git a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png Binary files differindex 74f4ad1..74f4ad1 100644 --- a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/flickable.png b/examples/svg/embedded/fluidlauncher/screenshots/flickable.png Binary files differindex bad14bf..bad14bf 100644 --- a/examples/embedded/fluidlauncher/screenshots/flickable.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/flickable.png diff --git a/examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/flightinfo_s60.png Binary files differindex 8e74d77..8e74d77 100644 --- a/examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/flightinfo_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png Binary files differindex d31875d..d31875d 100644 --- a/examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/ftp_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/ftp_s60.png Binary files differindex 5858daf..5858daf 100644 --- a/examples/embedded/fluidlauncher/screenshots/ftp_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/ftp_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/lightmaps.png b/examples/svg/embedded/fluidlauncher/screenshots/lightmaps.png Binary files differindex 18aa74d..18aa74d 100644 --- a/examples/embedded/fluidlauncher/screenshots/lightmaps.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/lightmaps.png diff --git a/examples/embedded/fluidlauncher/screenshots/mediaplayer.png b/examples/svg/embedded/fluidlauncher/screenshots/mediaplayer.png Binary files differindex c9fd43c..c9fd43c 100644 --- a/examples/embedded/fluidlauncher/screenshots/mediaplayer.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/mediaplayer.png diff --git a/examples/embedded/fluidlauncher/screenshots/pathstroke.png b/examples/svg/embedded/fluidlauncher/screenshots/pathstroke.png Binary files differindex c3d727e..c3d727e 100644 --- a/examples/embedded/fluidlauncher/screenshots/pathstroke.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/pathstroke.png diff --git a/examples/embedded/fluidlauncher/screenshots/qmlcalculator.png b/examples/svg/embedded/fluidlauncher/screenshots/qmlcalculator.png Binary files differindex f4218f5..f4218f5 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmlcalculator.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlcalculator.png diff --git a/examples/embedded/fluidlauncher/screenshots/qmlclocks.png b/examples/svg/embedded/fluidlauncher/screenshots/qmlclocks.png Binary files differindex ba25a18..ba25a18 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmlclocks.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlclocks.png diff --git a/examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png b/examples/svg/embedded/fluidlauncher/screenshots/qmldialcontrol.png Binary files differindex b8def8c..b8def8c 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmldialcontrol.png diff --git a/examples/embedded/fluidlauncher/screenshots/qmleasing.png b/examples/svg/embedded/fluidlauncher/screenshots/qmleasing.png Binary files differindex d34c2ac..d34c2ac 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmleasing.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmleasing.png diff --git a/examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg b/examples/svg/embedded/fluidlauncher/screenshots/qmlflickr.jpg Binary files differindex d7faabf..d7faabf 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlflickr.jpg diff --git a/examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg b/examples/svg/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg Binary files differindex 673ffc6..673ffc6 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg diff --git a/examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg b/examples/svg/embedded/fluidlauncher/screenshots/qmltwitter.jpg Binary files differindex 4399eea..4399eea 100644 --- a/examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg +++ b/examples/svg/embedded/fluidlauncher/screenshots/qmltwitter.jpg diff --git a/examples/embedded/fluidlauncher/screenshots/raycasting.png b/examples/svg/embedded/fluidlauncher/screenshots/raycasting.png Binary files differindex b6b738a..b6b738a 100644 --- a/examples/embedded/fluidlauncher/screenshots/raycasting.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/raycasting.png diff --git a/examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png Binary files differindex 54b6321..54b6321 100644 --- a/examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/softkeys_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/softkeys_s60.png Binary files differindex df090e2..df090e2 100644 --- a/examples/embedded/fluidlauncher/screenshots/softkeys_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/softkeys_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/spectrum.png b/examples/svg/embedded/fluidlauncher/screenshots/spectrum.png Binary files differindex 7f4938f..7f4938f 100644 --- a/examples/embedded/fluidlauncher/screenshots/spectrum.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/spectrum.png diff --git a/examples/embedded/fluidlauncher/screenshots/styledemo.png b/examples/svg/embedded/fluidlauncher/screenshots/styledemo.png Binary files differindex 669c488..669c488 100644 --- a/examples/embedded/fluidlauncher/screenshots/styledemo.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/styledemo.png diff --git a/examples/embedded/fluidlauncher/screenshots/styledemo_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/styledemo_s60.png Binary files differindex 57480fb..57480fb 100644 --- a/examples/embedded/fluidlauncher/screenshots/styledemo_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/styledemo_s60.png diff --git a/examples/embedded/fluidlauncher/screenshots/weatherinfo.png b/examples/svg/embedded/fluidlauncher/screenshots/weatherinfo.png Binary files differindex 7e23891..7e23891 100644 --- a/examples/embedded/fluidlauncher/screenshots/weatherinfo.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/weatherinfo.png diff --git a/examples/embedded/fluidlauncher/screenshots/wiggly.png b/examples/svg/embedded/fluidlauncher/screenshots/wiggly.png Binary files differindex b20fbc4..b20fbc4 100644 --- a/examples/embedded/fluidlauncher/screenshots/wiggly.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/wiggly.png diff --git a/examples/embedded/fluidlauncher/screenshots/wiggly_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/wiggly_s60.png Binary files differindex 9c4cab3..9c4cab3 100644 --- a/examples/embedded/fluidlauncher/screenshots/wiggly_s60.png +++ b/examples/svg/embedded/fluidlauncher/screenshots/wiggly_s60.png diff --git a/examples/embedded/fluidlauncher/slides/demo_1.png b/examples/svg/embedded/fluidlauncher/slides/demo_1.png Binary files differindex d53d19d..d53d19d 100644 --- a/examples/embedded/fluidlauncher/slides/demo_1.png +++ b/examples/svg/embedded/fluidlauncher/slides/demo_1.png diff --git a/examples/embedded/fluidlauncher/slides/demo_2.png b/examples/svg/embedded/fluidlauncher/slides/demo_2.png Binary files differindex f137de0..f137de0 100644 --- a/examples/embedded/fluidlauncher/slides/demo_2.png +++ b/examples/svg/embedded/fluidlauncher/slides/demo_2.png diff --git a/examples/embedded/fluidlauncher/slides/demo_3.png b/examples/svg/embedded/fluidlauncher/slides/demo_3.png Binary files differindex 8369bc0..8369bc0 100644 --- a/examples/embedded/fluidlauncher/slides/demo_3.png +++ b/examples/svg/embedded/fluidlauncher/slides/demo_3.png diff --git a/examples/embedded/fluidlauncher/slides/demo_4.png b/examples/svg/embedded/fluidlauncher/slides/demo_4.png Binary files differindex 377e369..377e369 100644 --- a/examples/embedded/fluidlauncher/slides/demo_4.png +++ b/examples/svg/embedded/fluidlauncher/slides/demo_4.png diff --git a/examples/embedded/fluidlauncher/slides/demo_5.png b/examples/svg/embedded/fluidlauncher/slides/demo_5.png Binary files differindex 0bb1781..0bb1781 100644 --- a/examples/embedded/fluidlauncher/slides/demo_5.png +++ b/examples/svg/embedded/fluidlauncher/slides/demo_5.png diff --git a/examples/embedded/fluidlauncher/slides/demo_6.png b/examples/svg/embedded/fluidlauncher/slides/demo_6.png Binary files differindex 9daba67..9daba67 100644 --- a/examples/embedded/fluidlauncher/slides/demo_6.png +++ b/examples/svg/embedded/fluidlauncher/slides/demo_6.png diff --git a/examples/embedded/fluidlauncher/slideshow.cpp b/examples/svg/embedded/fluidlauncher/slideshow.cpp index 5a3da0d..5a3da0d 100644 --- a/examples/embedded/fluidlauncher/slideshow.cpp +++ b/examples/svg/embedded/fluidlauncher/slideshow.cpp diff --git a/examples/embedded/fluidlauncher/slideshow.h b/examples/svg/embedded/fluidlauncher/slideshow.h index 2ebc6a2..2ebc6a2 100644 --- a/examples/embedded/fluidlauncher/slideshow.h +++ b/examples/svg/embedded/fluidlauncher/slideshow.h diff --git a/examples/embedded/weatherinfo/icons/README.txt b/examples/svg/embedded/weatherinfo/icons/README.txt index d384153..d384153 100644 --- a/examples/embedded/weatherinfo/icons/README.txt +++ b/examples/svg/embedded/weatherinfo/icons/README.txt diff --git a/examples/embedded/weatherinfo/icons/weather-few-clouds.svg b/examples/svg/embedded/weatherinfo/icons/weather-few-clouds.svg index a53e3d6..a53e3d6 100644 --- a/examples/embedded/weatherinfo/icons/weather-few-clouds.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-few-clouds.svg diff --git a/examples/embedded/weatherinfo/icons/weather-fog.svg b/examples/svg/embedded/weatherinfo/icons/weather-fog.svg index 56a2444..56a2444 100644 --- a/examples/embedded/weatherinfo/icons/weather-fog.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-fog.svg diff --git a/examples/embedded/weatherinfo/icons/weather-haze.svg b/examples/svg/embedded/weatherinfo/icons/weather-haze.svg index b31811f..b31811f 100644 --- a/examples/embedded/weatherinfo/icons/weather-haze.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-haze.svg diff --git a/examples/embedded/weatherinfo/icons/weather-icy.svg b/examples/svg/embedded/weatherinfo/icons/weather-icy.svg index 2c45b33..2c45b33 100644 --- a/examples/embedded/weatherinfo/icons/weather-icy.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-icy.svg diff --git a/examples/embedded/weatherinfo/icons/weather-overcast.svg b/examples/svg/embedded/weatherinfo/icons/weather-overcast.svg index cf77214..cf77214 100644 --- a/examples/embedded/weatherinfo/icons/weather-overcast.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-overcast.svg diff --git a/examples/embedded/weatherinfo/icons/weather-showers.svg b/examples/svg/embedded/weatherinfo/icons/weather-showers.svg index 017665d..017665d 100644 --- a/examples/embedded/weatherinfo/icons/weather-showers.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-showers.svg diff --git a/examples/embedded/weatherinfo/icons/weather-sleet.svg b/examples/svg/embedded/weatherinfo/icons/weather-sleet.svg index bf2306f..bf2306f 100644 --- a/examples/embedded/weatherinfo/icons/weather-sleet.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-sleet.svg diff --git a/examples/embedded/weatherinfo/icons/weather-snow.svg b/examples/svg/embedded/weatherinfo/icons/weather-snow.svg index a91946f..a91946f 100644 --- a/examples/embedded/weatherinfo/icons/weather-snow.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-snow.svg diff --git a/examples/embedded/weatherinfo/icons/weather-storm.svg b/examples/svg/embedded/weatherinfo/icons/weather-storm.svg index 1ad47ab..1ad47ab 100644 --- a/examples/embedded/weatherinfo/icons/weather-storm.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-storm.svg diff --git a/examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg b/examples/svg/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg index a27d30a..a27d30a 100644 --- a/examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg diff --git a/examples/embedded/weatherinfo/icons/weather-sunny.svg b/examples/svg/embedded/weatherinfo/icons/weather-sunny.svg index 248199c..248199c 100644 --- a/examples/embedded/weatherinfo/icons/weather-sunny.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-sunny.svg diff --git a/examples/embedded/weatherinfo/icons/weather-thundershower.svg b/examples/svg/embedded/weatherinfo/icons/weather-thundershower.svg index e1c2286..e1c2286 100644 --- a/examples/embedded/weatherinfo/icons/weather-thundershower.svg +++ b/examples/svg/embedded/weatherinfo/icons/weather-thundershower.svg diff --git a/examples/embedded/weatherinfo/weatherinfo.cpp b/examples/svg/embedded/weatherinfo/weatherinfo.cpp index 3648309..3648309 100644 --- a/examples/embedded/weatherinfo/weatherinfo.cpp +++ b/examples/svg/embedded/weatherinfo/weatherinfo.cpp diff --git a/examples/svg/embedded/weatherinfo/weatherinfo.pro b/examples/svg/embedded/weatherinfo/weatherinfo.pro new file mode 100644 index 0000000..94aefd1 --- /dev/null +++ b/examples/svg/embedded/weatherinfo/weatherinfo.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = weatherinfo +SOURCES = weatherinfo.cpp +RESOURCES = weatherinfo.qrc +QT += network svg + +target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/weatherinfo +INSTALLS += target +QT+=widgets diff --git a/examples/embedded/weatherinfo/weatherinfo.qrc b/examples/svg/embedded/weatherinfo/weatherinfo.qrc index 6e9d224..6e9d224 100644 --- a/examples/embedded/weatherinfo/weatherinfo.qrc +++ b/examples/svg/embedded/weatherinfo/weatherinfo.qrc diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro index 2445f96..40d4a6c 100644 --- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro +++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro @@ -5,10 +5,8 @@ HEADERS += embeddedsvgviewer.h SOURCES += embeddedsvgviewer.cpp main.cpp RESOURCES += embeddedsvgviewer.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/embeddedsvgviewer +INSTALLS += target wince* { DEPLOYMENT_PLUGIN += qsvg diff --git a/examples/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp index 02b6c50..02b6c50 100644 --- a/examples/network/bearercloud/bearercloud.cpp +++ b/examples/svg/network/bearercloud/bearercloud.cpp diff --git a/examples/network/bearercloud/bearercloud.h b/examples/svg/network/bearercloud/bearercloud.h index cd8e45e..cd8e45e 100644 --- a/examples/network/bearercloud/bearercloud.h +++ b/examples/svg/network/bearercloud/bearercloud.h diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/svg/network/bearercloud/bearercloud.pro index a993e23..723c8c7 100644 --- a/examples/network/bearercloud/bearercloud.pro +++ b/examples/svg/network/bearercloud/bearercloud.pro @@ -14,7 +14,5 @@ QT = core gui widgets network svg CONFIG += console # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network/bearercloud -sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES *.svg -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network/bearercloud -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/network/bearercloud +INSTALLS += target diff --git a/examples/network/bearercloud/bluetooth.svg b/examples/svg/network/bearercloud/bluetooth.svg index 32e2fa3..32e2fa3 100644 --- a/examples/network/bearercloud/bluetooth.svg +++ b/examples/svg/network/bearercloud/bluetooth.svg diff --git a/examples/network/bearercloud/cell.svg b/examples/svg/network/bearercloud/cell.svg index 7519868..7519868 100644 --- a/examples/network/bearercloud/cell.svg +++ b/examples/svg/network/bearercloud/cell.svg diff --git a/examples/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp index 0531ad2..0531ad2 100644 --- a/examples/network/bearercloud/cloud.cpp +++ b/examples/svg/network/bearercloud/cloud.cpp diff --git a/examples/network/bearercloud/cloud.h b/examples/svg/network/bearercloud/cloud.h index 1756b81..1756b81 100644 --- a/examples/network/bearercloud/cloud.h +++ b/examples/svg/network/bearercloud/cloud.h diff --git a/examples/network/bearercloud/gprs.svg b/examples/svg/network/bearercloud/gprs.svg index 4a992c1..4a992c1 100644 --- a/examples/network/bearercloud/gprs.svg +++ b/examples/svg/network/bearercloud/gprs.svg diff --git a/examples/network/bearercloud/icons.qrc b/examples/svg/network/bearercloud/icons.qrc index 7dea1f2..7dea1f2 100644 --- a/examples/network/bearercloud/icons.qrc +++ b/examples/svg/network/bearercloud/icons.qrc diff --git a/examples/network/bearercloud/lan.svg b/examples/svg/network/bearercloud/lan.svg index 4f7f63d..4f7f63d 100755 --- a/examples/network/bearercloud/lan.svg +++ b/examples/svg/network/bearercloud/lan.svg diff --git a/examples/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp index b81bca8..b81bca8 100644 --- a/examples/network/bearercloud/main.cpp +++ b/examples/svg/network/bearercloud/main.cpp diff --git a/examples/network/bearercloud/umts.svg b/examples/svg/network/bearercloud/umts.svg index c1b372e..c1b372e 100644 --- a/examples/network/bearercloud/umts.svg +++ b/examples/svg/network/bearercloud/umts.svg diff --git a/examples/network/bearercloud/unknown.svg b/examples/svg/network/bearercloud/unknown.svg index fd10298..fd10298 100644 --- a/examples/network/bearercloud/unknown.svg +++ b/examples/svg/network/bearercloud/unknown.svg diff --git a/examples/network/bearercloud/wlan.svg b/examples/svg/network/bearercloud/wlan.svg index 8b86089..8b86089 100644 --- a/examples/network/bearercloud/wlan.svg +++ b/examples/svg/network/bearercloud/wlan.svg diff --git a/examples/svg/network/network.pro b/examples/svg/network/network.pro new file mode 100644 index 0000000..6cf6c42 --- /dev/null +++ b/examples/svg/network/network.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +!contains(QT_CONFIG, no-widgets): SUBDIRS += bearercloud +QT+=widgets diff --git a/examples/opengl/framebufferobject/bubbles.svg b/examples/svg/opengl/framebufferobject/bubbles.svg index 5173012..5173012 100644 --- a/examples/opengl/framebufferobject/bubbles.svg +++ b/examples/svg/opengl/framebufferobject/bubbles.svg diff --git a/examples/opengl/framebufferobject/designer.png b/examples/svg/opengl/framebufferobject/designer.png Binary files differindex 4f32d57..4f32d57 100644 --- a/examples/opengl/framebufferobject/designer.png +++ b/examples/svg/opengl/framebufferobject/designer.png diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro new file mode 100644 index 0000000..45f3f19 --- /dev/null +++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro @@ -0,0 +1,9 @@ +QT += widgets opengl svg + +HEADERS += glwidget.h +SOURCES += glwidget.cpp main.cpp +RESOURCES += framebufferobject.qrc + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/svg/opengl/framebufferobject +INSTALLS += target diff --git a/examples/opengl/framebufferobject/framebufferobject.qrc b/examples/svg/opengl/framebufferobject/framebufferobject.qrc index 986f1ca..986f1ca 100644 --- a/examples/opengl/framebufferobject/framebufferobject.qrc +++ b/examples/svg/opengl/framebufferobject/framebufferobject.qrc diff --git a/examples/opengl/framebufferobject/glwidget.cpp b/examples/svg/opengl/framebufferobject/glwidget.cpp index 1f3ff78..1f3ff78 100644 --- a/examples/opengl/framebufferobject/glwidget.cpp +++ b/examples/svg/opengl/framebufferobject/glwidget.cpp diff --git a/examples/opengl/framebufferobject/glwidget.h b/examples/svg/opengl/framebufferobject/glwidget.h index c689ad5..c689ad5 100644 --- a/examples/opengl/framebufferobject/glwidget.h +++ b/examples/svg/opengl/framebufferobject/glwidget.h diff --git a/examples/opengl/framebufferobject/main.cpp b/examples/svg/opengl/framebufferobject/main.cpp index 3a414be..3a414be 100644 --- a/examples/opengl/framebufferobject/main.cpp +++ b/examples/svg/opengl/framebufferobject/main.cpp diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro new file mode 100644 index 0000000..fd845b6 --- /dev/null +++ b/examples/svg/opengl/opengl.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +!contains(QT_CONFIG, no-widgets): SUBDIRS += framebufferobject +QT+=widgets diff --git a/examples/svg/richtext/richtext.pro b/examples/svg/richtext/richtext.pro new file mode 100644 index 0000000..be9c6c3 --- /dev/null +++ b/examples/svg/richtext/richtext.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +!contains(QT_CONFIG, no-widgets): SUBDIRS += textobject +QT+=widgets diff --git a/examples/richtext/textobject/files/heart.svg b/examples/svg/richtext/textobject/files/heart.svg index ba5f050..ba5f050 100644 --- a/examples/richtext/textobject/files/heart.svg +++ b/examples/svg/richtext/textobject/files/heart.svg diff --git a/examples/richtext/textobject/main.cpp b/examples/svg/richtext/textobject/main.cpp index 4a0a6a0..4a0a6a0 100644 --- a/examples/richtext/textobject/main.cpp +++ b/examples/svg/richtext/textobject/main.cpp diff --git a/examples/richtext/textobject/resources.qrc b/examples/svg/richtext/textobject/resources.qrc index 39b2f5d..39b2f5d 100644 --- a/examples/richtext/textobject/resources.qrc +++ b/examples/svg/richtext/textobject/resources.qrc diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/svg/richtext/textobject/svgtextobject.cpp index 8e3e3e9..8e3e3e9 100644 --- a/examples/richtext/textobject/svgtextobject.cpp +++ b/examples/svg/richtext/textobject/svgtextobject.cpp diff --git a/examples/richtext/textobject/svgtextobject.h b/examples/svg/richtext/textobject/svgtextobject.h index f9ba114..f9ba114 100644 --- a/examples/richtext/textobject/svgtextobject.h +++ b/examples/svg/richtext/textobject/svgtextobject.h diff --git a/examples/richtext/textobject/textobject.desktop b/examples/svg/richtext/textobject/textobject.desktop index 1b0980f..1b0980f 100644 --- a/examples/richtext/textobject/textobject.desktop +++ b/examples/svg/richtext/textobject/textobject.desktop diff --git a/examples/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro index 5f0f913..34e84dc 100644 --- a/examples/richtext/textobject/textobject.pro +++ b/examples/svg/richtext/textobject/textobject.pro @@ -9,10 +9,8 @@ QT += svg RESOURCES = resources.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject -sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES files -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject +INSTALLS += target filesToDeploy.files = files/*.svg filesToDeploy.path = files diff --git a/examples/richtext/textobject/window.cpp b/examples/svg/richtext/textobject/window.cpp index ba1d16d..ba1d16d 100644 --- a/examples/richtext/textobject/window.cpp +++ b/examples/svg/richtext/textobject/window.cpp diff --git a/examples/richtext/textobject/window.h b/examples/svg/richtext/textobject/window.h index 7551233..7551233 100644 --- a/examples/richtext/textobject/window.h +++ b/examples/svg/richtext/textobject/window.h diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro index fdadc81..979f391 100644 --- a/examples/svg/svg.pro +++ b/examples/svg/svg.pro @@ -1,10 +1,8 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-widgets): SUBDIRS += embeddedsvgviewer svggenerator svgviewer +SUBDIRS += embedded richtext draganddrop network -QT+=widgets +contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2):SUBDIRS += opengl -# install -sources.files = svg.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg -INSTALLS += sources +QT+=widgets diff --git a/examples/svg/svggenerator/svggenerator.pro b/examples/svg/svggenerator/svggenerator.pro index 6945418..f13a9c4 100644 --- a/examples/svg/svggenerator/svggenerator.pro +++ b/examples/svg/svggenerator/svggenerator.pro @@ -11,9 +11,7 @@ QT += svg INCLUDEPATH += $$PWD # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator -sources.files = $$SOURCES $$HEADERS $$RESOURCES forms doc resources svggenerator.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/svggenerator +INSTALLS += target QT+=widgets diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index 9614741..43a89dc 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -11,10 +11,8 @@ contains(QT_CONFIG, opengl): QT += opengl CONFIG += console # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer -sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/svgviewer +INSTALLS += target wince*: { addFiles.files = files\\*.svg |