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

Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb

8 files changed, 30 insertions, 14 deletions

diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc
index 65e23d9dc7..d1690c5908 100644
--- a/src/corelib/doc/src/objectmodel/properties.qdoc
+++ b/src/corelib/doc/src/objectmodel/properties.qdoc
@@ -195,7 +195,7 @@
 
     Suppose we have a class MyClass, which is derived from QObject and
     which uses the Q_OBJECT macro in its private section. We want to
-    declare a property in MyClass to keep track of a priorty
+    declare a property in MyClass to keep track of a priority
     value. The name of the property will be \e priority, and its type
     will be an enumeration type named \e Priority, which is defined in
     MyClass.
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 747fd87207..5fb9640b19 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -273,7 +273,11 @@ static const struct {
     { "Documentation", "doc" }, // should be ${Data}/doc
     { "Headers", "include" },
     { "Libraries", "lib" },
+#ifdef Q_OS_WIN
+    { "LibraryExecutables", "bin" },
+#else
     { "LibraryExecutables", "libexec" }, // should be ${ArchData}/libexec
+#endif
     { "Binaries", "bin" },
     { "Plugins", "plugins" }, // should be ${ArchData}/plugins
     { "Imports", "imports" }, // should be ${ArchData}/imports
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 906ef128fa..628d12d881 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -40,12 +40,17 @@
 ****************************************************************************/
 
 #if defined(__OPTIMIZE__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) \
-    && (__GNUC__ * 100 + __GNUC_MINOR__ >= 404)
+    && (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ >= 440)
 // GCC 4.4 supports #pragma GCC optimize and #pragma GCC target
-#  pragma GCC optimize "O3"
-#  if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__)
-#   pragma GCC target "fpmath=sse"
-#  endif
+
+#    if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 473)
+// From GCC 4.7.3 onwards, GCC optimize can result in gcc bailing out with OOM
+#        pragma GCC optimize "O3"
+#    endif
+
+#    if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__)
+#        pragma GCC target "fpmath=sse"
+#    endif
 #endif
 
 #include <qstylehints.h>
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 7e6b55dead..545484de8d 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -172,7 +172,7 @@ QWindowsUser32DLL::QWindowsUser32DLL() :
     updateLayeredWindowIndirect(0),
     isHungAppWindow(0),
     registerTouchWindow(0), unregisterTouchWindow(0),
-    getTouchInputInfo(0), closeTouchInputHandle(0)
+    getTouchInputInfo(0), closeTouchInputHandle(0), setProcessDPIAware(0)
 {
 }
 
@@ -187,6 +187,7 @@ void QWindowsUser32DLL::init()
 
     updateLayeredWindowIndirect = (UpdateLayeredWindowIndirect)(library.resolve("UpdateLayeredWindowIndirect"));
     isHungAppWindow = (IsHungAppWindow)library.resolve("IsHungAppWindow");
+    setProcessDPIAware = (SetProcessDPIAware)library.resolve("SetProcessDPIAware");
 }
 
 bool QWindowsUser32DLL::initTouch()
@@ -252,7 +253,7 @@ struct QWindowsContextPrivate {
     QSet<QString> m_registeredWindowClassNames;
     HandleBaseWindowHash m_windows;
     HDC m_displayContext;
-    const int m_defaultDPI;
+    int m_defaultDPI;
     QWindowsKeyMapper m_keyMapper;
     QWindowsMouseHandler m_mouseHandler;
     QWindowsMimeConverter m_mimeConverter;
@@ -266,8 +267,6 @@ struct QWindowsContextPrivate {
 
 QWindowsContextPrivate::QWindowsContextPrivate() :
     m_systemInfo(0),
-    m_displayContext(GetDC(0)),
-    m_defaultDPI(GetDeviceCaps(m_displayContext,LOGPIXELSY)),
     m_oleInitializeResult(OleInitialize(NULL)),
     m_eventType(QByteArrayLiteral("windows_generic_MSG")),
     m_lastActiveWindow(0), m_asyncExpose(0)
@@ -276,6 +275,11 @@ QWindowsContextPrivate::QWindowsContextPrivate() :
     QWindowsContext::user32dll.init();
     QWindowsContext::shell32dll.init();
 #endif
+    // Ensure metrics functions report correct data, QTBUG-30063.
+    if (QWindowsContext::user32dll.setProcessDPIAware)
+        QWindowsContext::user32dll.setProcessDPIAware();
+    m_displayContext = GetDC(0);
+    m_defaultDPI = GetDeviceCaps(m_displayContext, LOGPIXELSY);
 
     const QSysInfo::WinVersion ver = QSysInfo::windowsVersion();
 #ifndef Q_OS_WINCE
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 1fe71e3aff..d60b632beb 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -80,6 +80,7 @@ struct QWindowsUser32DLL
                  const BLENDFUNCTION *, DWORD);
     typedef BOOL (WINAPI *UpdateLayeredWindowIndirect)(HWND, const UPDATELAYEREDWINDOWINFO *);
     typedef BOOL (WINAPI *IsHungAppWindow)(HWND);
+    typedef BOOL (WINAPI *SetProcessDPIAware)();
 
     // Functions missing in Q_CC_GNU stub libraries.
     SetLayeredWindowAttributes setLayeredWindowAttributes;
@@ -94,6 +95,9 @@ struct QWindowsUser32DLL
     UnregisterTouchWindow unregisterTouchWindow;
     GetTouchInputInfo getTouchInputInfo;
     CloseTouchInputHandle closeTouchInputHandle;
+
+    // Windows Vista onwards
+    SetProcessDPIAware setProcessDPIAware;
 };
 
 struct QWindowsShell32DLL
diff --git a/src/printsupport/doc/src/qtprintsupport-module.qdoc b/src/printsupport/doc/src/qtprintsupport-module.qdoc
index 47420368e5..477b9a7097 100644
--- a/src/printsupport/doc/src/qtprintsupport-module.qdoc
+++ b/src/printsupport/doc/src/qtprintsupport-module.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \module QtPrintSupport
-    \title Qt Print Support Module
+    \title Qt Print Support C++ Classes
     \brief The Qt PrintSupport module provides classes to make printing easier and portable.
 
     \ingroup modules
@@ -43,4 +43,3 @@
 
     \snippet code/doc_src_qtprintsupport.pro 0
 */
-
diff --git a/src/tools/qdoc/doc/config/qdoc.qdocconf b/src/tools/qdoc/doc/config/qdoc.qdocconf
index 6bbe934749..84e9689f50 100644
--- a/src/tools/qdoc/doc/config/qdoc.qdocconf
+++ b/src/tools/qdoc/doc/config/qdoc.qdocconf
@@ -20,7 +20,7 @@ tagfile = ../html/qdoc.tags
 qhp.projects            = QDoc
 
 qhp.QDoc.file                = qdoc.qhp
-qhp.QDoc.namespace           = qdoc.$QT_VERSION_TAG
+qhp.QDoc.namespace           = org.qt-project.qdoc.$QT_VERSION_TAG
 qhp.QDoc.virtualFolder       = qdoc
 qhp.QDoc.indexTitle          = QDoc Manual
 qhp.QDoc.indexRoot           =
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 075b2d52e8..6859cd0cd4 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -313,7 +313,7 @@ QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepr
 QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h)
 QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h)
 QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h)
-QT_CLASS_LIB(QDeclarativeView, QtQuick1, qdeclarativeview.h)
+QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h)
 QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h)