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

Change-Id: Iaac26eb3c356beb28f70417d63fd00bd0efb57ee

7 files changed, 283 insertions, 162 deletions

diff --git a/src/designer/src/components/propertyeditor/previewframe.cpp b/src/designer/src/components/propertyeditor/previewframe.cpp
index a97e46877..c093663e2 100644
--- a/src/designer/src/components/propertyeditor/previewframe.cpp
+++ b/src/designer/src/components/propertyeditor/previewframe.cpp
@@ -78,7 +78,7 @@ PreviewFrame::PreviewFrame(QWidget *parent) :
 
 void PreviewFrame::setPreviewPalette(const QPalette &pal)
 {
-    ensureMdiSubWindow()->widget()->setPalette(pal);
+    ensureMdiSubWindow()->setPalette(pal);
 }
 
 void PreviewFrame::setSubWindowActive(bool active)
diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp
index cc5a3af31..d041ec9be 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.cpp
+++ b/src/designer/src/components/propertyeditor/previewwidget.cpp
@@ -28,6 +28,11 @@
 
 #include "previewwidget.h"
 
+#include <QtWidgets/qaction.h>
+#include <QtWidgets/qmenu.h>
+
+#include <QtCore/qabstractitemmodel.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace qdesigner_internal;
@@ -36,6 +41,16 @@ PreviewWidget::PreviewWidget(QWidget *parent)
     : QWidget(parent)
 {
     ui.setupUi(this);
+    ui.treeWidget->expandAll();
+    auto model = ui.treeWidget->model();
+    ui.treeWidget->setCurrentIndex(model->index(0, 0, model->index(0, 0)));
+    auto toolButtonMenu = new QMenu(ui.menuToolButton);
+    toolButtonMenu->addAction(tr("Option 1"));
+    toolButtonMenu->addSeparator();
+    auto checkable = toolButtonMenu->addAction(tr("Checkable"));
+    checkable->setCheckable(true);
+    ui.menuToolButton->setMenu(toolButtonMenu);
+    ui.menuToolButton->setPopupMode(QToolButton::InstantPopup);
 }
 
 PreviewWidget::~PreviewWidget() = default;
diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui
index fc81c8b85..64c29229f 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.ui
+++ b/src/designer/src/components/propertyeditor/previewwidget.ui
@@ -1,4 +1,5 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <comment>*********************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -27,191 +28,296 @@
 **
 *********************************************************************</comment>
  <class>qdesigner_internal::PreviewWidget</class>
- <widget class="QWidget" name="qdesigner_internal::PreviewWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="qdesigner_internal::PreviewWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>471</width>
-    <height>251</height>
+    <width>608</width>
+    <height>367</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string extracomment="Palette Editor Preview Widget">Preview Window</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item rowspan="3" row="0" column="1" >
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="buttonGroup">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Buttons</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLineEdit" name="LineEdit1" >
-       <property name="text" >
-        <string extracomment="Palette Editor Preview Widget">LineEdit</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="ComboBox1" >
-       <item>
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">ComboBox</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QSpinBox" name="SpinBox1" />
-       </item>
-       <item>
-        <widget class="QPushButton" name="PushButton1" >
-         <property name="text" >
-          <string extracomment="Palette Editor Preview Widget">PushButton</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QScrollBar" name="ScrollBar1" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="Slider1" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QListWidget" name="listWidget" >
-       <property name="maximumSize" >
-        <size>
-         <width>32767</width>
-         <height>50</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QProgressBar" name="ProgressBar1" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="RadioButton1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton1</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton2">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton3">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton3</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="CheckBox1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">CheckBox1</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="CheckBox2">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Tristate CheckBox</string>
+          </property>
+          <property name="tristate">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QPushButton" name="PushButton1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">PushButton</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="toggleButton">
+          <property name="text">
+           <string>ToggleButton</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="toolButton">
+            <property name="text">
+             <string>ToolButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="menuToolButton">
+            <property name="text">
+             <string>Menu</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="ButtonGroup2" >
-     <property name="title" >
-      <string extracomment="Palette Editor Preview Widget">ButtonGroup2</string>
+   <item row="0" column="1">
+    <widget class="QGroupBox" name="itemGroupBox">
+     <property name="title">
+      <string>Item Views</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
       <item>
-       <widget class="QCheckBox" name="CheckBox1" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">CheckBox1</string>
-        </property>
-        <property name="checked" >
+       <widget class="QTreeWidget" name="treeWidget">
+        <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
+        <column>
+         <property name="text">
+          <string>Column 1</string>
+         </property>
+        </column>
+        <item>
+         <property name="text">
+          <string>Top Level 1</string>
+         </property>
+         <item>
+          <property name="text">
+           <string>Nested Item 1</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Nested Item 2</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Nested Item 3</string>
+          </property>
+         </item>
+        </item>
        </widget>
       </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="simpleGroupBox">
+     <property name="title">
+      <string>Simple Input Widgets</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLineEdit" name="LineEdit1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">LineEdit</string>
+          </property>
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="ComboBox1">
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">ComboBox</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Item1</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Item2</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
-       <widget class="QCheckBox" name="CheckBox2" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">CheckBox2</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QSpinBox" name="SpinBox1"/>
+        </item>
+        <item>
+         <widget class="QScrollBar" name="ScrollBar1">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSlider" name="Slider1">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="ButtonGroup1" >
-     <property name="title" >
-      <string extracomment="Palette Editor Preview Widget">ButtonGroup</string>
+   <item row="1" column="1">
+    <widget class="QGroupBox" name="displayGroupBox">
+     <property name="title">
+      <string>Display Widgets</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
-       <widget class="QRadioButton" name="RadioButton1" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton1</string>
+       <widget class="QProgressBar" name="ProgressBar1">
+        <property name="value">
+         <number>50</number>
         </property>
-        <property name="checked" >
-         <bool>true</bool>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RadioButton2" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton2</string>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>QLabel</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RadioButton3" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton3</string>
+       <widget class="QLabel" name="label_2">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="text">
+         <string>QLabel with frame</string>
         </property>
        </widget>
       </item>
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index 767d25171..8e2e399e0 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
@@ -160,7 +160,7 @@ VersionDialog::VersionDialog(QWidget *parent)
 
     lbl->setText(tr("%1"
                     "<br/>Copyright (C) %2 The Qt Company Ltd."
-                    ).arg(version, QStringLiteral("2019")));
+                    ).arg(version, QStringLiteral("2020")));
 
     lbl->setWordWrap(true);
     lbl->setOpenExternalLinks(true);
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index 35b3bbf94..5e43607d4 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -35,7 +35,7 @@
 #include <QtGui/qevent.h>
 #include <QtGui/qfontmetrics.h>
 #include <QtGui/qpixmap.h>
-#include <QtGui/qmatrix.h>
+#include <QtGui/qtransform.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qaction.h>
@@ -881,7 +881,7 @@ void Connection::updatePixmap(EndPoint::Type type)
     const LineDir dir = labelDir(type);
 
     if (dir == DownDir)
-        *pm = pm->transformed(QMatrix(0.0, -1.0, 1.0, 0.0, 0.0, 0.0));
+        *pm = pm->transformed(QTransform(0.0, -1.0, 1.0, 0.0, 0.0, 0.0));
 }
 
 void Connection::checkWidgets()
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index f7947d938..68466d597 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -54,7 +54,7 @@
 #include <QtWidgets/qaction.h>
 #include <QtWidgets/qactiongroup.h>
 #include <QtGui/qcursor.h>
-#include <QtGui/qmatrix.h>
+#include <QtGui/qtransform.h>
 
 #include <QtCore/qmap.h>
 #include <QtCore/qdebug.h>
@@ -169,7 +169,7 @@ protected:
     virtual void fitWidget(const QSize &size);
     //  Calculate the complete transformation for the skin
     // (base class implementation provides rotation).
-    virtual QMatrix skinTransform() const;
+    virtual QTransform skinTransform() const;
 
 private:
     const QSize m_screenSize;
@@ -286,9 +286,9 @@ void PreviewDeviceSkin::fitWidget(const QSize &size)
     view()->setFixedSize(size);
 }
 
-QMatrix PreviewDeviceSkin::skinTransform() const
+QTransform PreviewDeviceSkin::skinTransform() const
 {
-    QMatrix newTransform;
+    QTransform newTransform;
     switch (m_direction)  {
         case DirectionUp:
             break;
@@ -342,7 +342,7 @@ signals:
 
 protected:
     void populateContextMenu(QMenu *m) override;
-    QMatrix skinTransform() const override;
+    QTransform skinTransform() const override;
     void fitWidget(const QSize &size) override;
 
 private:
@@ -415,10 +415,10 @@ void ZoomablePreviewDeviceSkin::populateContextMenu(QMenu *menu)
     menu->addSeparator();
 }
 
-QMatrix ZoomablePreviewDeviceSkin::skinTransform() const
+QTransform ZoomablePreviewDeviceSkin::skinTransform() const
 {
     // Complete transformation consisting of base class rotation and zoom.
-    QMatrix rc = PreviewDeviceSkin::skinTransform();
+    QTransform rc = PreviewDeviceSkin::skinTransform();
     const int zp = zoomPercent();
     if (zp != 100) {
         const qreal factor = zoomFactor(zp);
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index 7a7ca2afc..9670958ce 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -516,7 +516,7 @@ void ZoomWidget::dump() const
 {
 
     qDebug() << "ZoomWidget::dump " << geometry() << " Viewport " << viewport()->geometry()
-        << "Scroll: " << scrollPosition() << "Matrix: " << matrix() << " SceneRect: " << sceneRect();
+        << "Scroll: " << scrollPosition() << "Transform: " << transform() << " SceneRect: " << sceneRect();
     if (m_proxy) {
         qDebug() << "Proxy Pos: " << m_proxy->pos() << "Proxy " << m_proxy->size()
             << "\nProxy size hint"