diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
| commit | 3a6f5735ee723ff998114314c5ccdf6609667f6f (patch) | |
| tree | 9c877dd1e35972fa336cea8a61986594f168b49c /tests/auto/quick/touchmouse | |
| parent | 000b6330d4ca7165ff241b21ee728ed28d82fba1 (diff) | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc
Diffstat (limited to 'tests/auto/quick/touchmouse')
| -rw-r--r-- | tests/auto/quick/touchmouse/touchmouse.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro index e21695904e..e7c50e6f54 100644 --- a/tests/auto/quick/touchmouse/touchmouse.pro +++ b/tests/auto/quick/touchmouse/touchmouse.pro @@ -13,8 +13,6 @@ TESTDATA = data/* # OTHER_FILES += data/foo.qml -CONFIG += parallel_test - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 mac:CONFIG+=insignificant_test # QTBUG-27890 |