diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-08-20 19:22:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2013-08-20 19:24:31 +0200 |
| commit | 3dbfd45f6f278f8e521fa9f035acf5310102b836 (patch) | |
| tree | f16cd11ceba046eb9d15872153d482fe81965c31 /tests/auto | |
| parent | b3f1ed3b3b359722dc692256cbb3b89818bab49b (diff) | |
| parent | 09b0cb956940f45deaf35392630bd05453558d43 (diff) | |
| download | qtquickcontrols-3dbfd45f6f278f8e521fa9f035acf5310102b836.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I97e6044a5d28ab875628e61ea67474f3c0a4ef4b
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/controls/controls.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro index 49f8f0f3..e1da1d55 100644 --- a/tests/auto/controls/controls.pro +++ b/tests/auto/controls/controls.pro @@ -42,3 +42,5 @@ OTHER_FILES += \ $$PWD/data/tst_splitview.qml \ $$PWD/data/tst_styles.qml \ $$PWD/data/tst_layout.qml + +win32-msvc2010:contains(QT_CONFIG, angle):CONFIG += insignificant_test # QTBUG-33029 |