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

Conflicts:
	src/plugins/platforms/qnx/qqnxscreen.cpp
	src/plugins/platforms/windows/qwindowsdialoghelpers.cpp

Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a

3 files changed, 12 insertions, 1 deletions

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 869e94b566..14bc26f770 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1495,8 +1495,9 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog()
     // Apply settings.
     const QSharedPointer<QFileDialogOptions> &opts = options();
     m_data.fromOptions(opts);
+    const QFileDialogOptions::FileMode mode = opts->fileMode();
     result->setWindowTitle(opts->windowTitle());
-    result->setMode(opts->fileMode(), opts->options());
+    result->setMode(mode, opts->options());
     result->setHideFiltersDetails(opts->testOption(QFileDialogOptions::HideNameFilterDetails));
     const QStringList nameFilters = opts->nameFilters();
     if (!nameFilters.isEmpty())
@@ -1513,6 +1514,12 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog()
         if (!info.isDir())
             result->selectFile(info.fileName());
     }
+    // No need to select initialNameFilter if mode is Dir
+    if (mode != QFileDialogOptions::Directory && mode != QFileDialogOptions::DirectoryOnly) {
+        const QString initialNameFilter = opts->initiallySelectedNameFilter();
+        if (!initialNameFilter.isEmpty())
+            result->selectNameFilter(initialNameFilter);
+    }
     const QString defaultSuffix = opts->defaultSuffix();
     if (!defaultSuffix.isEmpty())
         result->setDefaultSuffix(defaultSuffix);
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.h b/src/plugins/platforms/windows/qwindowsmousehandler.h
index b3bfa03380..caf30e6b1a 100644
--- a/src/plugins/platforms/windows/qwindowsmousehandler.h
+++ b/src/plugins/platforms/windows/qwindowsmousehandler.h
@@ -109,6 +109,8 @@ Qt::KeyboardModifiers QWindowsMouseHandler::keyStateToModifiers(int wParam)
       mods |= Qt::ControlModifier;
     if (wParam & MK_SHIFT)
       mods |= Qt::ShiftModifier;
+    if (GetKeyState(VK_MENU) < 0)
+      mods |= Qt::AltModifier;
     return mods;
 }
 
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index bb0092cd54..2d0f537477 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -257,6 +257,8 @@ static void setWindowOpacity(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, qr
         } else {
             QWindowsContext::user32dll.setLayeredWindowAttributes(hwnd, 0, (int)(level * 255), LWA_ALPHA);
         }
+    } else if (IsWindowVisible(hwnd)) { // Repaint when switching from layered.
+        InvalidateRect(hwnd, NULL, TRUE);
     }
 #endif // !Q_OS_WINCE
 }