summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-14 20:14:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-14 20:14:18 (GMT)
commit62e2f0b44c92a0f59416bcd4d9bc87e35cb6d80a (patch)
treef934fb50d74f91763806bc0afecbacd980279aa2 /examples
parentd6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a (diff)
parentaa10afea34995c262156d26957455b698e630953 (diff)
downloadQt-62e2f0b44c92a0f59416bcd4d9bc87e35cb6d80a.zip
Qt-62e2f0b44c92a0f59416bcd4d9bc87e35cb6d80a.tar.gz
Qt-62e2f0b44c92a0f59416bcd4d9bc87e35cb6d80a.tar.bz2
Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration
* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits) Fix warnings, whitespace cleanup Don't rely on uninitialized data Doc: Fixing typo Doc: Fixing typo Skip failing tests Use effective user id instead of getlogin Fix compile error in tst_qfileinfo on Mac/Linux Fix tst_QFileInfo owner() & group() failure on Windows. Fix tst_QFileInfo::canonicalFilePath failure on Windows Fix QDir::relativeFilePath Fix spelling in comments Add missing license header to test case Define _WIN32_WINNT before any includes New attempt at fixing compilation failure Removing unused duplicate definitions No symbolic links in Windows CE Set minimum target Windows version to 2000 More missing includes Add missing include Fix compile error ...
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.pro2
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index f6e09a2..f700f0b 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -24,5 +24,5 @@ symbian:{
importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir
importFiles.path = ImageProviderCore
- DEPLOYMENT = importFiles
+ DEPLOYMENT += importFiles
}
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index 0f5398b..d92e072 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
@@ -20,5 +20,5 @@ symbian:{
importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir
importFiles.path = QWidgets
- DEPLOYMENT = importFiles
+ DEPLOYMENT += importFiles
}