diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-12 00:07:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-12 00:07:57 (GMT) |
| commit | c9b2dc28d831f93e9e58dc11209171cebbdaf8f6 (patch) | |
| tree | 61a22922989599bb4faf318b5233267737157cde /tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro | |
| parent | ea99fab06a9c2365bcd992681fe682af98cb4c4b (diff) | |
| parent | 3f42986b357c5066adb9755454bc4bcc4915ab9f (diff) | |
| download | Qt-c9b2dc28d831f93e9e58dc11209171cebbdaf8f6.zip Qt-c9b2dc28d831f93e9e58dc11209171cebbdaf8f6.tar.gz Qt-c9b2dc28d831f93e9e58dc11209171cebbdaf8f6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Backport more imports directory caching changes.
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
Diffstat (limited to 'tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro index b07bf9e..29b9eb9 100644 --- a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro @@ -10,7 +10,7 @@ SOURCES += tst_qdeclarativeloader.cpp \ symbian: { importFiles.sources = data importFiles.path = . - DEPLOYMENT = importFiles + DEPLOYMENT += importFiles } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } |