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: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
This commit is contained in:
Frederik Gladhorn
2014-01-10 18:30:14 +01:00
parent b0481d4b47 da89319f38
commit d2545bd40f
20 changed files with 267 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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