From bb5d287cc3eb68e1e46e5c3eb0a2c3991900354d Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 16 Mar 2015 13:10:27 +0100 Subject: Windows: Don't cause a malloc before calling GetLastError() When creating a string it would cause a malloc which would reset GetLastError() so we need to ensure that GetLastError() is the first thing it calls if a Windows API call fails. Task-number: QTBUG-27765 Change-Id: I5cc4ce59aa1f03a0ec978fe54949a7931a225d52 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/corelib/kernel/qsharedmemory_android.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/kernel/qsharedmemory_android.cpp') diff --git a/src/corelib/kernel/qsharedmemory_android.cpp b/src/corelib/kernel/qsharedmemory_android.cpp index f7511ea8b7..cdcd5685e0 100644 --- a/src/corelib/kernel/qsharedmemory_android.cpp +++ b/src/corelib/kernel/qsharedmemory_android.cpp @@ -47,7 +47,7 @@ QSharedMemoryPrivate::QSharedMemoryPrivate() { } -void QSharedMemoryPrivate::setErrorString(const QString &function) +void QSharedMemoryPrivate::setErrorString(QLatin1String function) { Q_UNUSED(function); qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; -- cgit v1.2.3