diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-07 17:46:39 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 17:46:39 +0100 |
commit | 77686f3b94dfd572778eb8dfa77717114e3abb93 (patch) | |
tree | 922cae3c7f7a4abbdf0890e5a53096c8b242a080 /tests/auto/quick/qquickanimations | |
parent | fbada9b1c12b5245e2eb07ed9383a0bccb1a968f (diff) | |
parent | 0906ae8ae7df09ec775ef2f038e4924a5de95a33 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 |