slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: I310b468e9ba5b1e70f2e792df746a93ecb067c1a
This commit is contained in:
Frederik Gladhorn
2014-03-24 16:07:34 +01:00
parent cd7882b760 4aeda4943e
commit 2618b6c77d
71 changed files with 1691 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/integration/qcamerabackend/qcamerabackend.pro
View File

@@ -9,4 +9,3 @@ CONFIG += testcase
SOURCES += tst_qcamerabackend.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
mac: CONFIG += insignificant_test # QTBUG-36040