diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /examples/xml | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'examples/xml')
| -rw-r--r-- | examples/xml/dombookmarks/dombookmarks.pro | 7 | ||||
| -rw-r--r-- | examples/xml/htmlinfo/htmlinfo.pro | 6 | ||||
| -rw-r--r-- | examples/xml/saxbookmarks/saxbookmarks.pro | 6 |
3 files changed, 0 insertions, 19 deletions
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 0ab4f0266d..07004377a0 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -10,10 +10,3 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks INSTALLS += target - -wince { - addFiles.files = frank.xbel jennifer.xbel - addFiles.path = "\\My Documents" - INSTALLS += addFiles -} - diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro index 8adaa780b8..e106c69b52 100644 --- a/examples/xml/htmlinfo/htmlinfo.pro +++ b/examples/xml/htmlinfo/htmlinfo.pro @@ -6,12 +6,6 @@ RESOURCES = resources.qrc win32: CONFIG += console -wince { - htmlfiles.files = *.html - htmlfiles.path = . - INSTALLS += htmlfiles -} - # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo INSTALLS += target diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index 96a48ef5d4..d07a6e3fb8 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -12,9 +12,3 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks INSTALLS += target - -wince { - addFiles.files = frank.xbel jennifer.xbel - addFiles.path = "\\My Documents" - INSTALLS += addFiles -} |