summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-11-20 14:04:16 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-21 11:37:23 (GMT)
commit42dfb4f04d3543222bbfbfeed7528f68ec647766 (patch)
tree5c42a55f1102319a89b88dfd3151206de550c0c5 /src/multimedia
parentc99872b59f30c160aa5f561b2a59e0631c826121 (diff)
downloadQt-42dfb4f04d3543222bbfbfeed7528f68ec647766.zip
Qt-42dfb4f04d3543222bbfbfeed7528f68ec647766.tar.gz
Qt-42dfb4f04d3543222bbfbfeed7528f68ec647766.tar.bz2
Multimedia: Fix MinGW-warning about assigning NULL to int-type.
Change-Id: I58fc7628845ed0733b79af5ab89c360ab8a12863 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index dcebe2d..67fd069 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -264,7 +264,7 @@ void QAudioDeviceInfoInternal::updateLists()
// redo all lists based on current settings
bool base = false;
bool match = false;
- DWORD fmt = NULL;
+ DWORD fmt = 0;
QString tmp;
if(device.compare(QLatin1String("default")) == 0)