Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e

7 files changed, 15 insertions, 15 deletions

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 2c2dbeef9d..55f8fc9b2c 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -1364,15 +1364,15 @@ namespace QtPrivate
         enum { Value = sizeof(checkType(static_cast<T*>(0))) == sizeof(void*)  };
     };
 
-    char qt_getEnumMetaObject(...);
-    char qt_getEnumMetaObject(); // Workaround bugs in MSVC.
+    template<typename T> char qt_getEnumMetaObject(const T&);
 
     template<typename T>
     struct IsQEnumHelper {
         static const T &declval();
-        // If the type was declared with Q_ENUM, the friend qt_getEnumMetaObject(T) declared in the
+        // If the type was declared with Q_ENUM, the friend qt_getEnumMetaObject() declared in the
         // Q_ENUM macro will be chosen by ADL, and the return type will be QMetaObject*.
-        // Otherwise the chosen overload will be qt_getEnumMetaObject(...) which returne 'char'
+        // Otherwise the chosen overload will be the catch all template function
+        // qt_getEnumMetaObject(T) which returns 'char'
         enum { Value = sizeof(qt_getEnumMetaObject(declval())) == sizeof(QMetaObject*) };
     };
 
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";
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index 0308dde57f..2bcc0d4f6a 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -133,7 +133,7 @@ public:
     bool attach(QSharedMemory::AccessMode mode);
     bool detach();
 
-    void setErrorString(const QString &function);
+    void setErrorString(QLatin1String function);
 
 #ifndef QT_NO_SYSTEMSEMAPHORE
     bool tryLocker(QSharedMemoryLocker *locker, const QString &function) {
diff --git a/src/corelib/kernel/qsharedmemory_posix.cpp b/src/corelib/kernel/qsharedmemory_posix.cpp
index 74f98a158a..1142d3223c 100644
--- a/src/corelib/kernel/qsharedmemory_posix.cpp
+++ b/src/corelib/kernel/qsharedmemory_posix.cpp
@@ -94,7 +94,7 @@ bool QSharedMemoryPrivate::create(int size)
 #endif
     if (fd == -1) {
         const int errorNumber = errno;
-        const QString function = QLatin1String("QSharedMemory::create");
+        const QLatin1String function("QSharedMemory::attach (shm_open)");
         switch (errorNumber) {
         case ENAMETOOLONG:
         case EINVAL:
@@ -138,7 +138,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
 #endif
     if (hand == -1) {
         const int errorNumber = errno;
-        const QString function = QLatin1String("QSharedMemory::attach (shm_open)");
+        const QLatin1String function("QSharedMemory::attach (shm_open)");
         switch (errorNumber) {
         case ENAMETOOLONG:
         case EINVAL:
diff --git a/src/corelib/kernel/qsharedmemory_systemv.cpp b/src/corelib/kernel/qsharedmemory_systemv.cpp
index 953747e41d..29fee12c0b 100644
--- a/src/corelib/kernel/qsharedmemory_systemv.cpp
+++ b/src/corelib/kernel/qsharedmemory_systemv.cpp
@@ -149,7 +149,7 @@ bool QSharedMemoryPrivate::create(int size)
 
     // create
     if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
-        QString function = QLatin1String("QSharedMemory::create");
+        const QLatin1String function("QSharedMemory::create");
         switch (errno) {
         case EINVAL:
             errorString = QSharedMemory::tr("%1: system-imposed size restrictions").arg(QLatin1String("QSharedMemory::handle"));
@@ -199,7 +199,7 @@ bool QSharedMemoryPrivate::detach()
 {
     // detach from the memory segment
     if (-1 == shmdt(memory)) {
-        QString function = QLatin1String("QSharedMemory::detach");
+        const QLatin1String function("QSharedMemory::detach");
         switch (errno) {
         case EINVAL:
             errorString = QSharedMemory::tr("%1: not attached").arg(function);
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index 92184a619b..ec6223142f 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -71,7 +71,7 @@ QSharedMemoryPrivate::QSharedMemoryPrivate()
 {
 }
 
-void QSharedMemoryPrivate::setErrorString(const QString &function)
+void QSharedMemoryPrivate::setErrorString(QLatin1String function)
 {
     // EINVAL is handled in functions so they can give better error strings
     switch (errno) {
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index 8e094cb458..4d37368b2e 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -47,9 +47,9 @@ QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(),
 {
 }
 
-void QSharedMemoryPrivate::setErrorString(const QString &function)
+void QSharedMemoryPrivate::setErrorString(QLatin1String function)
 {
-    BOOL windowsError = GetLastError();
+    DWORD windowsError = GetLastError();
     if (windowsError == 0)
         return;
     switch (windowsError) {
@@ -91,7 +91,7 @@ void QSharedMemoryPrivate::setErrorString(const QString &function)
 HANDLE QSharedMemoryPrivate::handle()
 {
     if (!hand) {
-        QString function = QLatin1String("QSharedMemory::handle");
+        const QLatin1String function("QSharedMemory::handle");
         if (nativeKey.isEmpty()) {
             error = QSharedMemory::KeyError;
             errorString = QSharedMemory::tr("%1: unable to make key").arg(function);
@@ -130,7 +130,7 @@ bool QSharedMemoryPrivate::cleanHandle()
 
 bool QSharedMemoryPrivate::create(int size)
 {
-    QString function = QLatin1String("QSharedMemory::create");
+    const QLatin1String function("QSharedMemory::create");
     if (nativeKey.isEmpty()) {
         error = QSharedMemory::KeyError;
         errorString = QSharedMemory::tr("%1: key error").arg(function);