summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-08 07:30:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-08 07:30:13 (GMT)
commitfe3439827048b54288e5807a057ea6093d67bca9 (patch)
tree52f1e7c186a060d692fdeb3b9ffe3637ebe51533 /tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
parentdfd7c876263310c03d8b64033749efe2b6b1e081 (diff)
parent436395417fb092dc143d64aea52ad00d7c9b7488 (diff)
downloadQt-fe3439827048b54288e5807a057ea6093d67bca9.zip
Qt-fe3439827048b54288e5807a057ea6093d67bca9.tar.gz
Qt-fe3439827048b54288e5807a057ea6093d67bca9.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: (21 commits) Don't layout multiple times when an ancestor becomes (in)visible. Add an example of animated item add/remove in ListView Add test for PropertyChanges with attached properties. Make declarative autotests compile on Symbian abld build system Accept enter key in the webbrower demo url input. Keep reported point/pixel size in sync. Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus Ensure state operations assigned to the default state are triggered Add image example. Fix regression in input panel autotests Improve docs about Qml component case sensitivity. Add some performance tips to QML docs. Move QListModelInterface into util. Ensure ParticleMotionGravity always pulls in the right direction. Remove version ifdefs from Particles; only 4.7 is supported. Update docs for the runtime.orientation values Revert to Portrait/Landscape terminology for Orientation enum, with Add more Q_AUTOTEST_EXPORTs Improve input panel handling in declarative demos and examples Always integer align anchor center points ...
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro')
-rw-r--r--tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
index b381a9b..6af6500 100644
--- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
+++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
@@ -4,9 +4,8 @@ SOURCES += tst_qdeclarativeqt.cpp
macx:CONFIG -= app_bundle
symbian: {
- DEFINES += SRCDIR=\".\"
importFiles.sources = data
- importFiles.path =
+ importFiles.path = .
DEPLOYMENT = importFiles
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"