diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-14 04:14:28 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-14 04:14:28 +0200 |
| commit | 1f27cd843bbdea3b6507f49ffb57e0c09888c463 (patch) | |
| tree | c5f005715b2e7340732cfc1d6f2b21126595bced /tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp | |
| parent | ee60791655c3303e50cef4fc0ebd1ad644467fc8 (diff) | |
| parent | e6ea89f3b7b2f42e09cfd3771f30ded536c54a73 (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: (53 commits)
ListView.onRemove animation is not played when the list has only one item.
Move listview/itemlist.qml to a separate visualitemmodel example
Make snapping work properly for highlight ranges > item size
Fix test - sizeHint should not change after initial load. Also use
Minor doc fixes
Doc improvements, including snippet fixes, linking to examples, making
Fix qmlviewer test failure on windows
Do not keep flush timer running once no pixmaps are detached.
Avoid recursive refill() in List/GridView
Make snippet compile and pass license test, and add missing snippet file
Remove accidentaly added characters.
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.
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp index 22f7966cf7..97b77d06b0 100644 --- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp +++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp @@ -50,6 +50,11 @@ #include <QtDeclarative/private/qdeclarativeanchors_p_p.h> #include <QtDeclarative/private/qdeclarativeitem_p.h> +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + Q_DECLARE_METATYPE(QDeclarativeAnchors::Anchor) Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine) |