diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-03-26 19:15:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-26 19:15:39 +0100 |
| commit | 609d5c681b1ec3f6a504e2fdd5680115b54e37f5 (patch) | |
| tree | deae69abe3ac8e7cc42259d37735e509aa03112a /tests | |
| parent | c5c3ce6f9bcdb560e30438ffca5647580f2f00c1 (diff) | |
| parent | 2618b6c77ddf7fd8e7a54dd80891b724c8fc035f (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 |