Merge remote-tracking branch 'origin/5.6' into 5.7

And blacklisted a few tests in tst_QUdpSocket.

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsystemdetection.h
	src/corelib/io/qfileselector.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	tests/auto/network/socket/qudpsocket/BLACKLIST

Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6

1 files changed, 23 insertions, 20 deletions

diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp
index f34714c016..7cbf979901 100644
--- a/src/widgets/util/qsystemtrayicon_win.cpp
+++ b/src/widgets/util/qsystemtrayicon_win.cpp
@@ -236,22 +236,9 @@ void QSystemTrayIconSys::setIconContents(NOTIFYICONDATA &tnd)
         qStringToLimitedWCharArray(tip, tnd.szTip, sizeof(tnd.szTip)/sizeof(wchar_t));
 }
 
-static int iconFlag( QSystemTrayIcon::MessageIcon icon )
-{
-    switch (icon) {
-        case QSystemTrayIcon::Information:
-            return NIIF_INFO;
-        case QSystemTrayIcon::Warning:
-            return NIIF_WARNING;
-        case QSystemTrayIcon::Critical:
-            return NIIF_ERROR;
-        case QSystemTrayIcon::NoIcon:
-            return NIIF_NONE;
-        default:
-            Q_ASSERT_X(false, "QSystemTrayIconSys::showMessage", "Invalid QSystemTrayIcon::MessageIcon value");
-            return NIIF_NONE;
-    }
-}
+#ifndef NIIF_LARGE_ICON
+#  define NIIF_LARGE_ICON 0x00000020
+#endif
 
 bool QSystemTrayIconSys::showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon type, uint uSecs)
 {
@@ -261,7 +248,22 @@ bool QSystemTrayIconSys::showMessage(const QString &title, const QString &messag
     qStringToLimitedWCharArray(title, tnd.szInfoTitle, 64);
 
     tnd.uID = q_uNOTIFYICONID;
-    tnd.dwInfoFlags = iconFlag(type);
+    switch (type) {
+    case QSystemTrayIcon::Information:
+        tnd.dwInfoFlags = NIIF_INFO;
+        break;
+    case QSystemTrayIcon::Warning:
+        tnd.dwInfoFlags = NIIF_WARNING;
+        break;
+    case QSystemTrayIcon::Critical:
+        tnd.dwInfoFlags = NIIF_ERROR;
+        break;
+    case QSystemTrayIcon::NoIcon:
+        tnd.dwInfoFlags = hIcon ? NIIF_USER : NIIF_NONE;
+        break;
+    }
+    if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA)
+        tnd.dwInfoFlags |= NIIF_LARGE_ICON;
     tnd.cbSize = notifyIconSize;
     tnd.hWnd = m_hwnd;
     tnd.uTimeout = uSecs;
@@ -302,9 +304,10 @@ HICON QSystemTrayIconSys::createIcon()
     const QIcon icon = q->icon();
     if (icon.isNull())
         return oldIcon;
-    const int iconSizeX = GetSystemMetrics(SM_CXSMICON);
-    const int iconSizeY = GetSystemMetrics(SM_CYSMICON);
-    const QSize size = icon.actualSize(QSize(iconSizeX, iconSizeY));
+    const QSize requestedSize = QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA
+        ? QSize(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON))
+        : QSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
+    const QSize size = icon.actualSize(requestedSize);
     const QPixmap pm = icon.pixmap(size);
     if (pm.isNull())
         return oldIcon;