diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-10 22:42:55 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-10 22:42:55 +0200 |
commit | 0afb2e2ba1b3a83e888b8b584c14e92dffb02596 (patch) | |
tree | eded7c252bf19b1f60cbbec993c7e6b76c13d327 /tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro | |
parent | 497da277770ccf37e05a7b519afd5206601a7cf1 (diff) | |
parent | 1546eeb7379ba7805c9f1a467fbc7e31dd377bab (diff) |
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: (42 commits)
Update on color change.
Update on color change.
Add go button to webbrowser example.
Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and
Document attached properties
Add 'on' prefix to documentation of signals
Stablize qmlviewer test
Improve test stability.
qmlviewer: ensure that only clicks on the current file list are handled.
Doc improvements: move some example code to snippets, add screenshots,
Move some example code into snippets/ and add other doc fixes
Fix crash when changing ListView model with highlightRangeMode: ListView.StrictlyEnforceRange
Fix GridView bounds behavior with snapping enabled.
Small optimization when checking if MouseArea's onPressAndHold is
Fix autotest.
Fixed `nmake clean' breaking declarative imports on Windows.
Fix drawing flicker on Qml Viewer startup
Fix snake demo
Add qmlmethod Item::childAt() to delarative item
Cursor positioning in QTextDocument after undo()
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro')
-rw-r--r-- | tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index f37d952702..4121a335b6 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -5,9 +5,8 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeproperty.cpp symbian: { - DEFINES += SRCDIR=\".\" importFiles.sources = data - importFiles.path = + importFiles.path = . DEPLOYMENT = importFiles } else { DEFINES += SRCDIR=\\\"$$PWD\\\" |