diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 16:43:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 16:43:31 (GMT) |
| commit | 4c198b5c44e176b8bfe8d070b9fa94ee1e6a0e33 (patch) | |
| tree | e1707bcdac8138018732031b1f7f8dca335785fb /examples | |
| parent | 71f8955e0a2744bccff94495c4db5e054db8ab95 (diff) | |
| parent | 84fa2a82ea90ad2c554b54bd08db1f41d85484ea (diff) | |
| download | Qt-4c198b5c44e176b8bfe8d070b9fa94ee1e6a0e33.zip Qt-4c198b5c44e176b8bfe8d070b9fa94ee1e6a0e33.tar.gz Qt-4c198b5c44e176b8bfe8d070b9fa94ee1e6a0e33.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: (218 commits)
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
Update def files
Fix tst_QFile::caseSensitivity test on Mac
Fix typo in QFile test
Add test generated files to .gitignore
Fix compile error for qdir autotest on symbian3
QtDeclarative: make autotests compile on symbian
...
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/cppextensions/imageprovider/imageprovider.pro | 2 | ||||
| -rw-r--r-- | examples/declarative/cppextensions/qwidgets/qwidgets.pro | 2 |
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 } |