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

Change-Id: I60b8a701b6d90f8572143cf760873f6b8b453c14

3 files changed, 22 insertions, 11 deletions

diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp
index 4552b7219b..248b12ac31 100644
--- a/src/imports/layouts/plugin.cpp
+++ b/src/imports/layouts/plugin.cpp
@@ -42,6 +42,13 @@
 #include "qquicklinearlayout_p.h"
 #include "qquickstacklayout_p.h"
 
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtQuick_Layouts);
+#endif
+}
+
 QT_BEGIN_NAMESPACE
 
 //![class decl]
@@ -50,6 +57,10 @@ class QtQuickLayoutsPlugin : public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 public:
+    QtQuickLayoutsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent)
+    {
+        initResources();
+    }
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Layouts"));
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index d4d4e1703d..abc8f97cec 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -40,7 +40,7 @@
 #include "qquicklayout_p.h"
 #include <QEvent>
 #include <QtCore/qcoreapplication.h>
-#include <QtCore/qnumeric.h>
+#include <QtCore/private/qnumeric_p.h>
 #include <QtCore/qmath.h>
 #include <limits>
 
@@ -134,7 +134,7 @@ QQuickLayoutAttached::QQuickLayoutAttached(QObject *parent)
 */
 void QQuickLayoutAttached::setMinimumWidth(qreal width)
 {
-    if (qIsNaN(width))
+    if (qt_is_nan(width))
         return;
     m_isMinimumWidthSet = width >= 0;
     if (m_minimumWidth == width)
@@ -162,7 +162,7 @@ void QQuickLayoutAttached::setMinimumWidth(qreal width)
 */
 void QQuickLayoutAttached::setMinimumHeight(qreal height)
 {
-    if (qIsNaN(height))
+    if (qt_is_nan(height))
         return;
     m_isMinimumHeightSet = height >= 0;
     if (m_minimumHeight == height)
@@ -186,7 +186,7 @@ void QQuickLayoutAttached::setMinimumHeight(qreal height)
 */
 void QQuickLayoutAttached::setPreferredWidth(qreal width)
 {
-    if (qIsNaN(width) || m_preferredWidth == width)
+    if (qt_is_nan(width) || m_preferredWidth == width)
         return;
 
     m_preferredWidth = width;
@@ -207,7 +207,7 @@ void QQuickLayoutAttached::setPreferredWidth(qreal width)
 */
 void QQuickLayoutAttached::setPreferredHeight(qreal height)
 {
-    if (qIsNaN(height) || m_preferredHeight == height)
+    if (qt_is_nan(height) || m_preferredHeight == height)
         return;
 
     m_preferredHeight = height;
@@ -232,7 +232,7 @@ void QQuickLayoutAttached::setPreferredHeight(qreal height)
 */
 void QQuickLayoutAttached::setMaximumWidth(qreal width)
 {
-    if (qIsNaN(width))
+    if (qt_is_nan(width))
         return;
     m_isMaximumWidthSet = width >= 0;
     if (m_maximumWidth == width)
@@ -259,7 +259,7 @@ void QQuickLayoutAttached::setMaximumWidth(qreal width)
 */
 void QQuickLayoutAttached::setMaximumHeight(qreal height)
 {
-    if (qIsNaN(height))
+    if (qt_is_nan(height))
         return;
     m_isMaximumHeightSet = height >= 0;
     if (m_maximumHeight == height)
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index 2f8af4c58b..0b4a1968d7 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -40,7 +40,7 @@
 #include "qquicklinearlayout_p.h"
 #include "qquickgridlayoutengine_p.h"
 #include "qquicklayoutstyleinfo_p.h"
-#include <QtCore/qnumeric.h>
+#include <QtCore/private/qnumeric_p.h>
 #include "qdebug.h"
 #include <limits>
 
@@ -566,7 +566,7 @@ qreal QQuickGridLayout::columnSpacing() const
 void QQuickGridLayout::setColumnSpacing(qreal spacing)
 {
     Q_D(QQuickGridLayout);
-    if (qIsNaN(spacing) || columnSpacing() == spacing)
+    if (qt_is_nan(spacing) || columnSpacing() == spacing)
         return;
 
     d->engine.setSpacing(spacing, Qt::Horizontal);
@@ -588,7 +588,7 @@ qreal QQuickGridLayout::rowSpacing() const
 void QQuickGridLayout::setRowSpacing(qreal spacing)
 {
     Q_D(QQuickGridLayout);
-    if (qIsNaN(spacing) || rowSpacing() == spacing)
+    if (qt_is_nan(spacing) || rowSpacing() == spacing)
         return;
 
     d->engine.setSpacing(spacing, Qt::Vertical);
@@ -867,7 +867,7 @@ qreal QQuickLinearLayout::spacing() const
 void QQuickLinearLayout::setSpacing(qreal space)
 {
     Q_D(QQuickLinearLayout);
-    if (qIsNaN(space) || spacing() == space)
+    if (qt_is_nan(space) || spacing() == space)
         return;
 
     d->engine.setSpacing(space, Qt::Horizontal | Qt::Vertical);