diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 15:50:28 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 15:50:28 +0200 |
| commit | 715d0b474b23bc230319c33eb7316af23b5fccaa (patch) | |
| tree | ffd714454ce559433551632ffaaee1a21d8fd0a3 /tests/auto/particles | |
| parent | 607f2db351edf4b0f677c302fa37733596abe024 (diff) | |
| parent | 52eb21be3dd3a76d018b5b86a8d72d68accb924a (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/qml.pro
Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
Diffstat (limited to 'tests/auto/particles')
| -rw-r--r-- | tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro index 1cb792eff2..1f957c23ff 100644 --- a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro +++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro @@ -3,6 +3,8 @@ TARGET = tst_qquicktrailemitter SOURCES += tst_qquicktrailemitter.cpp macx:CONFIG -= app_bundle +win32-msvc2012:CONFIG += insignificant_test # QTBUG-33421 + include (../../shared/util.pri) TESTDATA = data/* |