summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-12 15:43:09 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-13 16:46:31 +0200
commitbaf8a2fbf710314096832b0ee5735ffdc8b24210 (patch)
tree3f0939b40cf557c88b6b1488276f9ec6dfc2cb8e /src
parent6fd01fc9649d15fab507570e8d8219e861abc588 (diff)
Kernel: Fix gcc warning in qsharedmemory_win.cpp
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>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qsharedmemory_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index c3f8dcf2ff..e21eb28558 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -103,7 +103,7 @@ HANDLE QSharedMemoryPrivate::handle()
if (nativeKey.isEmpty()) {
error = QSharedMemory::KeyError;
errorString = QSharedMemory::tr("%1: unable to make key").arg(function);
- return false;
+ return 0;
}
#ifndef Q_OS_WINCE
hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)nativeKey.utf16());
@@ -114,7 +114,7 @@ HANDLE QSharedMemoryPrivate::handle()
#endif
if (!hand) {
setErrorString(function);
- return false;
+ return 0;
}
}
return hand;