diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:07:34 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:07:34 +0100 |
| commit | 2618b6c77ddf7fd8e7a54dd80891b724c8fc035f (patch) | |
| tree | f187433bd4eb509875b189a43fa8039eee42663c /tests | |
| parent | cd7882b760ae34034b1b5b53c6e7970eb05f2bc2 (diff) | |
| parent | 4aeda4943e9532719c49f02a5997f74fe4e0e7c9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I310b468e9ba5b1e70f2e792df746a93ecb067c1a
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/qcamerabackend.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro index c39ce9c41..b19c52abe 100644 --- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro @@ -9,4 +9,3 @@ CONFIG += testcase SOURCES += tst_qcamerabackend.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -mac: CONFIG += insignificant_test # QTBUG-36040 |