AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kernel: Fix gcc warning in qsharedmemory_win.cpp

Browse Source 
Fix gcc 4.7 'arning: converting 'false' to pointer type 'HANDLE {aka void*}' [-Wconversion-null]'

Change-Id: I28d890d5fd4975517a9329d68c9ef73f6fadf36c
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Kai Koehne 2012-09-12 15:43:09 +02:00 committed by Qt by Nokia
parent 6fd01fc964
commit baf8a2fbf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qsharedmemory_win.cpp
View File

@ -103,7 +103,7 @@ HANDLE QSharedMemoryPrivate::handle()
if (nativeKey.isEmpty()) { if (nativeKey.isEmpty()) {
error = QSharedMemory::KeyError; error = QSharedMemory::KeyError;
errorString = QSharedMemory::tr("%1: unable to make key").arg(function); errorString = QSharedMemory::tr("%1: unable to make key").arg(function);
return false; return 0;
} }
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)nativeKey.utf16()); hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)nativeKey.utf16());
@ -114,7 +114,7 @@ HANDLE QSharedMemoryPrivate::handle()
#endif #endif
if (!hand) { if (!hand) {
setErrorString(function); setErrorString(function);
return false; return 0;
} }
} }
return hand; return hand;