Fix build after removal of QStyleOption::init in qtbase

Use QStyleOption::initFrom instead.

Change-Id: I9d286f09e4761ec90791ba495be4e7e98a5fe200
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

6 files changed, 7 insertions, 7 deletions

diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp
index ee0e3db1b..5facfdad3 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -390,7 +390,7 @@ QRect ButtonTextTaskMenuInlineEditor::editRectangle() const
 {
     QWidget *w = widget();
     QStyleOptionButton opt;
-    opt.init(w);
+    opt.initFrom(w);
     return w->style()->subElementRect(QStyle::SE_PushButtonContents, &opt, w);
 }
 
@@ -413,7 +413,7 @@ QRect LinkDescriptionTaskMenuInlineEditor::editRectangle() const
 {
     QWidget *w = widget(); // TODO: What is the exact description area?
     QStyleOptionButton opt;
-    opt.init(w);
+    opt.initFrom(w);
     return w->style()->subElementRect(QStyle::SE_PushButtonContents, &opt, w);
 }
 
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index f2b39d053..bc6cb5524 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -59,7 +59,7 @@ QRect GroupBoxTaskMenuInlineEditor::editRectangle() const
 {
     QWidget *w = widget();
     QStyleOption opt; // ## QStyleOptionGroupBox
-    opt.init(w);
+    opt.initFrom(w);
     return QRect(QPoint(), QSize(w->width(),20));
 }
 
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index d6a45d438..aaaa619a6 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -61,7 +61,7 @@ LabelTaskMenuInlineEditor::LabelTaskMenuInlineEditor(QLabel *w, QObject *parent)
 QRect LabelTaskMenuInlineEditor::editRectangle() const
 {
     QStyleOptionButton opt;
-    opt.init(widget());
+    opt.initFrom(widget());
     return opt.rect;
 }
 
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index b39797564..f52a060e6 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -58,7 +58,7 @@ LineEditTaskMenuInlineEditor::LineEditTaskMenuInlineEditor(QLineEdit *w, QObject
 QRect LineEditTaskMenuInlineEditor::editRectangle() const
 {
     QStyleOption opt;
-    opt.init(widget());
+    opt.initFrom(widget());
     return opt.rect;
 }
 
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index 9d21c5159..75c8ae988 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -135,7 +135,7 @@ void VersionLabel::paintEvent(QPaintEvent *pe)
     if (secondStage) {
         QPainter p(this);
         QStyleOptionButton opt;
-        opt.init(this);
+        opt.initFrom(this);
         if (!m_pushed)
             opt.state |= QStyle::State_Raised;
         else
diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp
index d47a2b1b9..d67fafe36 100644
--- a/src/shared/qtgradienteditor/qtcolorline.cpp
+++ b/src/shared/qtgradienteditor/qtcolorline.cpp
@@ -878,7 +878,7 @@ void QtColorLinePrivate::paintEvent(QPaintEvent *)
     r[1].adjust(br, br, -br, -br);
     if (r[1].adjusted(lw, lw, -lw, -lw).isValid()) {
         QStyleOptionFrame opt;
-        opt.init(q_ptr);
+        opt.initFrom(q_ptr);
         opt.rect = r[1];
         opt.lineWidth = 2;
         opt.midLineWidth = 1;