diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:30:14 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:30:14 +0100 |
| commit | d2545bd40f0a4150f616f52b9138a34c60ed2d3c (patch) | |
| tree | e9e76ae976a20a22ff400a1cdd0650bf90da45b9 /tests | |
| parent | b0481d4b47f96b157989203bf57ec7e8ca266513 (diff) | |
| parent | da89319f3859b30cf4cf03a53b50677092138921 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/qcamerabackend.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro index 1a0c44ea8..c39ce9c41 100644 --- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro @@ -8,3 +8,5 @@ CONFIG += testcase SOURCES += tst_qcamerabackend.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +mac: CONFIG += insignificant_test # QTBUG-36040 |