diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-26 10:36:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-26 10:36:32 +0100 |
| commit | 0906ae8ae7df09ec775ef2f038e4924a5de95a33 (patch) | |
| tree | f4b2821ee37d669445ad8184a423bd439136e977 /tests/auto/quick/qquickanimations | |
| parent | 9a5568a1972b72b32ae3058903cc7f4d7123b96b (diff) | |
| parent | 0825d24cf5c35a7c6fe37088f23b793e33c69063 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If45606c96ef130588004598c560aa790373f0a78
Diffstat (limited to 'tests/auto/quick/qquickanimations')
| -rw-r--r-- | tests/auto/quick/qquickanimations/qquickanimations.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro index 1e294b9ae0..f3e1cd082f 100644 --- a/tests/auto/quick/qquickanimations/qquickanimations.pro +++ b/tests/auto/quick/qquickanimations/qquickanimations.pro @@ -1,5 +1,5 @@ CONFIG += testcase -mac:CONFIG+=insignificant_test # QTBUG-29062 +win32-g++|mac:CONFIG+=insignificant_test # QTBUG-29062 TARGET = tst_qquickanimations SOURCES += tst_qquickanimations.cpp |