Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I010a6322d12e038fdce247a58dfb05e204c2ff3b

5 files changed, 11 insertions, 9 deletions

diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index b2d81066db..5bab897d43 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -805,11 +805,11 @@ QByteArray QFileSystemEngine::id(const QFileSystemEntry &entry)
 }
 
 //static
-QByteArray QFileSystemEngine::id(int id)
+QByteArray QFileSystemEngine::id(int fd)
 {
     QT_STATBUF statResult;
-    if (QT_FSTAT(id, &statResult)) {
-        qErrnoWarning("fstat() failed for fd %d", id);
+    if (QT_FSTAT(fd, &statResult)) {
+        qErrnoWarning("fstat() failed for fd %d", fd);
         return QByteArray();
     }
     QByteArray result = QByteArray::number(quint64(statResult.st_dev), 16);
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index a0304697b8..6b6ac10713 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qatomic.h>
+#include <QtCore/qglobal.h>
 
 #ifndef QBASICATOMIC_H
 #define QBASICATOMIC_H
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index f3857259ed..ebd9037e44 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1327,7 +1327,7 @@ QRect QImage::rect() const
     The image depth is the number of bits used to store a single
     pixel, also called bits per pixel (bpp).
 
-    The supported depths are 1, 8, 16, 24 and 32.
+    The supported depths are 1, 8, 16, 24, 32 and 64.
 
     \sa bitPlaneCount(), convertToFormat(), {QImage#Image Formats}{Image Formats},
     {QImage#Image Information}{Image Information}
@@ -1570,7 +1570,9 @@ void QImage::setColor(int i, QRgb c)
     Returns a pointer to the pixel data at the scanline with index \a
     i. The first scanline is at index 0.
 
-    The scanline data is aligned on a 32-bit boundary.
+    The scanline data is as minimum 32-bit aligned. For 64-bit formats
+    it follows the native alignment of 64-bit integers (64-bit for most
+    platforms, but notably 32-bit on i386).
 
     \warning If you are accessing 32-bpp image data, cast the returned
     pointer to \c{QRgb*} (QRgb has a 32-bit size) and use it to
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 6da7265cfd..1b17759b5f 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -967,7 +967,9 @@ void QWindowsNativeFileDialogBase::doExec(HWND owner)
     const HRESULT hr = m_fileDialog->Show(owner);
     QWindowsDialogs::eatMouseMove();
     qCDebug(lcQpaDialogs) << '<' << __FUNCTION__ << " returns " << hex << hr;
-    if (hr == S_OK) {
+    // Emit accepted() only if there is a result as otherwise UI hangs occur.
+    // For example, typing in invalid URLs results in empty result lists.
+    if (hr == S_OK && !m_data.selectedFiles().isEmpty()) {
         emit accepted();
     } else {
         emit rejected();
diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri
index 821c40af81..be535c1846 100644
--- a/src/widgets/styles/styles.pri
+++ b/src/widgets/styles/styles.pri
@@ -33,8 +33,6 @@ SOURCES += \
 
 RESOURCES += styles/qstyle.qrc
 
-include($$OUT_PWD/qtwidgets-config.pri)
-
 qtConfig(animation) {
     HEADERS += styles/qstyleanimation_p.h
     SOURCES += styles/qstyleanimation.cpp