summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:24:05 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:24:05 +0200
commit612c3041475550837dee7149b9f5e9e4f55c17a0 (patch)
tree5102403cbd4f0b3b392df4ec4dc14947f4c13735
parentefc4d3240016f285cad3a523996ad57641046c89 (diff)
parentb722836765dccca04683939d0d4f72a9e2585d88 (diff)
downloadqtsvg-612c3041475550837dee7149b9f5e9e4f55c17a0.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I14c3db02026247710ea21ef90e804773acf53cac
-rw-r--r--doc/src/images/weatherinfo-demo.pngbin49688 -> 36807 bytes
-rw-r--r--examples/svg/richtext/textobject/textobject.pro8
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/src/images/weatherinfo-demo.png b/doc/src/images/weatherinfo-demo.png
index 3183aa4..7132b94 100644
--- a/doc/src/images/weatherinfo-demo.png
+++ b/doc/src/images/weatherinfo-demo.png
Binary files differ
diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro
index 794ad32..8892ae7 100644
--- a/examples/svg/richtext/textobject/textobject.pro
+++ b/examples/svg/richtext/textobject/textobject.pro
@@ -12,6 +12,8 @@ RESOURCES = resources.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject
INSTALLS += target
-filesToDeploy.files = files/*.svg
-filesToDeploy.path = files
-DEPLOYMENT += filesToDeploy
+wince*{
+ filesToDeploy.files = files/*.svg
+ filesToDeploy.path = files
+ DEPLOYMENT += filesToDeploy
+}