Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	src/plugins/designer/codemodelhelpers.cpp

Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699

5 files changed, 8 insertions, 11 deletions

diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp
index 34de90a477..354c7b4f46 100644
--- a/src/shared/designerintegrationv2/formresizer.cpp
+++ b/src/shared/designerintegrationv2/formresizer.cpp
@@ -42,14 +42,13 @@ using namespace SharedTools::Internal;
 
 FormResizer::FormResizer(QWidget *parent) :
     QWidget(parent),
-    m_frame(new QFrame),
-    m_formWindow(0)
+    m_frame(new QFrame)
 {
     // Make the resize grip of a mainwindow form find us as resizable window.
     setWindowFlags(windowFlags() | Qt::SubWindow);
     setBackgroundRole(QPalette::Base);
 
-    QVBoxLayout *handleLayout = new QVBoxLayout(this);
+    auto handleLayout = new QVBoxLayout(this);
     handleLayout->setContentsMargins(SELECTION_MARGIN, SELECTION_MARGIN,
                                      SELECTION_MARGIN, SELECTION_MARGIN);
     handleLayout->addWidget(m_frame);
@@ -166,7 +165,7 @@ QWidget *FormResizer::mainContainer()
 {
     if (m_formWindow)
         return m_formWindow->mainContainer();
-    return 0;
+    return nullptr;
 }
 
 void FormResizer::mainContainerChanged()
diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h
index aad1a57b0f..a1bdf02161 100644
--- a/src/shared/designerintegrationv2/formresizer.h
+++ b/src/shared/designerintegrationv2/formresizer.h
@@ -60,7 +60,7 @@ class FormResizer : public QWidget
     Q_OBJECT
 public:
 
-    FormResizer(QWidget *parent = 0);
+    FormResizer(QWidget *parent = nullptr);
 
     void updateGeometry();
     void setState(SelectionHandleState st);
@@ -84,7 +84,7 @@ private:
     QFrame *m_frame;
     typedef QVector<SizeHandleRect*> Handles;
     Handles m_handles;
-    QDesignerFormWindowInterface * m_formWindow;
+    QDesignerFormWindowInterface *m_formWindow = nullptr;
 };
 
 }
diff --git a/src/shared/designerintegrationv2/widgethost.cpp b/src/shared/designerintegrationv2/widgethost.cpp
index ed7f2fb91d..3ce7975c03 100644
--- a/src/shared/designerintegrationv2/widgethost.cpp
+++ b/src/shared/designerintegrationv2/widgethost.cpp
@@ -41,7 +41,6 @@ using namespace SharedTools;
 // ---------- WidgetHost
 WidgetHost::WidgetHost(QWidget *parent, QDesignerFormWindowInterface *formWindow) :
     QScrollArea(parent),
-    m_formWindow(0),
     m_formResizer(new Internal::FormResizer)
 {
     setWidget(m_formResizer);
@@ -52,8 +51,7 @@ WidgetHost::WidgetHost(QWidget *parent, QDesignerFormWindowInterface *formWindow
 
 WidgetHost::~WidgetHost()
 {
-    if (m_formWindow)
-        delete m_formWindow;
+    delete m_formWindow;
 }
 
 void WidgetHost::setFormWindow(QDesignerFormWindowInterface *fw)
@@ -75,7 +73,7 @@ void WidgetHost::setFormWindow(QDesignerFormWindowInterface *fw)
 QSize WidgetHost::formWindowSize() const
 {
     if (!m_formWindow || !m_formWindow->mainContainer())
-        return QSize();
+        return {};
     return m_formWindow->mainContainer()->size();
 }
 
diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h
index ccf8590e91..1545509493 100644
--- a/src/shared/designerintegrationv2/widgethost.h
+++ b/src/shared/designerintegrationv2/widgethost.h
@@ -60,7 +60,7 @@ private slots:
 private:
     QSize formWindowSize() const;
 
-    QDesignerFormWindowInterface *m_formWindow;
+    QDesignerFormWindowInterface *m_formWindow = nullptr;
     Internal::FormResizer *m_formResizer;
     QSize m_oldFakeWidgetSize;
 };
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject de04ecbbf59b361320a174ee0117c2cfa8c1001
+Subproject 491b293b07e59f69f2c8d9721ac6a098844d590