diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-12 13:43:09 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 22:39:56 (GMT) |
| commit | 15ecf1ee9e30a8911546969e76d53eda1b6a78af (patch) | |
| tree | ce3a13775865f3d2d09ff73eb56f6e60f8e7e51e /src | |
| parent | 0afca3160d8abbe200dfde52acf90f13b57017a9 (diff) | |
| download | Qt-15ecf1ee9e30a8911546969e76d53eda1b6a78af.zip Qt-15ecf1ee9e30a8911546969e76d53eda1b6a78af.tar.gz Qt-15ecf1ee9e30a8911546969e76d53eda1b6a78af.tar.bz2 | |
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>
(cherry picked from qtbase/baf8a2fbf710314096832b0ee5735ffdc8b24210)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index f343928..ce75dd6 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -109,7 +109,7 @@ HANDLE QSharedMemoryPrivate::handle() if (nativeKey.isEmpty()) { error = QSharedMemory::KeyError; errorString = QSharedMemory::tr("%1: key is empty").arg(QLatin1String("QSharedMemory::handle")); - return false; + return 0; } #ifndef Q_OS_WINCE hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)nativeKey.utf16()); |