Qt Designer: Use typedefs QObject/WidgetList where appropriate

Remove the TabOrder typedef in MetaDataBaseItem.

Change-Id: I75852ee6b6a71cee7fbbbd82653cd9069894f421
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

19 files changed, 63 insertions, 68 deletions

diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index feb07a60e..d679cd5ff 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -271,7 +271,7 @@ void BuddyEditor::endConnection(QWidget *target, const QPoint &pos)
 
 void BuddyEditor::widgetRemoved(QWidget *widget)
 {
-    QList<QWidget*> child_list = widget->findChildren<QWidget*>();
+    QWidgetList child_list = widget->findChildren<QWidget*>();
     child_list.prepend(widget);
 
     ConnectionSet remove_set;
diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h
index d2502f4a7..bda20077f 100644
--- a/src/designer/src/components/formeditor/formwindow.h
+++ b/src/designer/src/components/formeditor/formwindow.h
@@ -128,7 +128,7 @@ public:
 
     bool hasInsertedChildren(QWidget *w) const;
 
-    QList<QWidget *> selectedWidgets() const;
+    QWidgetList selectedWidgets() const;
     void clearSelection(bool changePropertyDisplay = true) Q_DECL_OVERRIDE;
     bool isWidgetSelected(QWidget *w) const;
     void selectWidget(QWidget *w, bool select = true) Q_DECL_OVERRIDE;
@@ -140,11 +140,11 @@ public:
     void raiseChildSelections(QWidget *w);
     void raiseSelection(QWidget *w);
 
-    inline const QList<QWidget *>& widgets() const { return m_widgets; }
+    inline const QWidgetList& widgets() const { return m_widgets; }
     inline int widgetCount() const { return m_widgets.count(); }
     inline QWidget *widgetAt(int index) const { return m_widgets.at(index); }
 
-    QList<QWidget *> widgets(QWidget *widget) const;
+    QWidgetList widgets(QWidget *widget) const;
 
     QWidget *createWidget(DomUI *ui, const QRect &rect, QWidget *target);
 
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index efdada830..6e8ff65b3 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -556,7 +556,7 @@ void FormWindowManager::slotActionRaiseActivated()
 
 static inline QWidget *findLayoutContainer(const FormWindow *fw)
 {
-    QList<QWidget*> l(fw->selectedWidgets());
+    QWidgetList l(fw->selectedWidgets());
     fw->simplifySelection(&l);
     return l.empty() ? fw->mainContainer() : l.front();
 }
@@ -584,7 +584,7 @@ void FormWindowManager::createLayout()
 
 void FormWindowManager::slotActionBreakLayoutActivated()
 {
-    const QList<QWidget *> layouts = layoutsToBeBroken();
+    const QWidgetList layouts = layoutsToBeBroken();
     if (layouts.isEmpty())
         return;
 
@@ -621,7 +621,7 @@ void FormWindowManager::slotActionAdjustSizeActivated()
 
     m_activeFormWindow->beginCommand(tr("Adjust Size"));
 
-    QList<QWidget*> selectedWidgets = m_activeFormWindow->selectedWidgets();
+    QWidgetList selectedWidgets = m_activeFormWindow->selectedWidgets();
     m_activeFormWindow->simplifySelection(&selectedWidgets);
 
     if (selectedWidgets.isEmpty()) {
@@ -672,7 +672,7 @@ void FormWindowManager::slotActionGroupPreviewInStyle(const QString &style, int
 QWidgetList FormWindowManager::layoutsToBeBroken(QWidget *w) const
 {
     if (!w)
-        return QList<QWidget *>();
+        return QWidgetList();
 
     if (debugFWM)
         qDebug() << "layoutsToBeBroken: " << w;
@@ -706,17 +706,17 @@ QWidgetList FormWindowManager::layoutsToBeBroken(QWidget *w) const
         if (qobject_cast<const QSplitter *>(widget)) {
             if (debugFWM)
                 qDebug() << "layoutsToBeBroken: Splitter special";
-            QList<QWidget *> list = layoutsToBeBroken(parent);
+            QWidgetList list = layoutsToBeBroken(parent);
             list.append(widget);
             return list;
         }
         if (debugFWM)
             qDebug() << "layoutsToBeBroken: Is a container but doesn't have a managed layout (has an internal layout), returning 0";
-        return QList<QWidget *>();
+        return QWidgetList();
     }
 
     if (managedLayout) {
-        QList<QWidget *> list;
+        QWidgetList list;
         if (debugFWM)
             qDebug() << "layoutsToBeBroken: Is a container and has a layout";
         if (qobject_cast<const QLayoutWidget *>(widget)) {
@@ -729,7 +729,7 @@ QWidgetList FormWindowManager::layoutsToBeBroken(QWidget *w) const
     }
     if (debugFWM)
         qDebug() << "layoutsToBeBroken: Is a container but doesn't have a layout at all, returning 0";
-    return QList<QWidget *>();
+    return QWidgetList();
 
 }
 
@@ -738,19 +738,16 @@ QMap<QWidget *, bool> FormWindowManager::getUnsortedLayoutsToBeBroken(bool first
     // Return a set of layouts to be broken.
     QMap<QWidget *, bool> layouts;
 
-    QList<QWidget *> selection = m_activeFormWindow->selectedWidgets();
+    QWidgetList selection = m_activeFormWindow->selectedWidgets();
     if (selection.isEmpty() && m_activeFormWindow->mainContainer())
         selection.append(m_activeFormWindow->mainContainer());
 
-    const QList<QWidget *>::const_iterator scend = selection.constEnd();
-    for (QList<QWidget *>::const_iterator sit = selection.constBegin(); sit != scend; ++sit) {
+    for (QWidget *selectedWidget : qAsConst(selection)) {
         // find all layouts
-        const QList<QWidget *> list = layoutsToBeBroken(*sit);
+        const QWidgetList &list = layoutsToBeBroken(selectedWidget);
         if (!list.empty()) {
-            const QList<QWidget *>::const_iterator lbcend = list.constEnd();
-            for (QList<QWidget *>::const_iterator lbit = list.constBegin(); lbit != lbcend; ++lbit) {
-                layouts.insert(*lbit, true);
-            }
+            for (QWidget *widget : list)
+                layouts.insert(widget, true);
             if (firstOnly)
                 return layouts;
         }
@@ -770,13 +767,13 @@ QWidgetList FormWindowManager::layoutsToBeBroken() const
     // up to the first 'real' widget with a layout in hierarchy order.
     QMap<QWidget *, bool> unsortedLayouts = getUnsortedLayoutsToBeBroken(false);
     // Sort in order of hierarchy
-    QList<QWidget *> orderedLayoutList;
+    QWidgetList orderedLayoutList;
     const QMap<QWidget *, bool>::const_iterator lscend  = unsortedLayouts.constEnd();
     for (QMap<QWidget *, bool>::const_iterator itLay = unsortedLayouts.constBegin(); itLay != lscend; ++itLay) {
         QWidget *wToBeInserted = itLay.key();
         if (!orderedLayoutList.contains(wToBeInserted)) {
             // try to find first child, use as insertion position, else append
-            const QList<QWidget *>::iterator firstChildPos = findFirstChildOf(orderedLayoutList.begin(), orderedLayoutList.end(), wToBeInserted);
+            const QWidgetList::iterator firstChildPos = findFirstChildOf(orderedLayoutList.begin(), orderedLayoutList.end(), wToBeInserted);
             if (firstChildPos == orderedLayoutList.end()) {
                 orderedLayoutList.push_back(wToBeInserted);
             } else {
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 5fa4ef698..59b785766 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -1023,10 +1023,10 @@ QWidget *QDesignerResource::createWidget(const QString &widgetName, QWidget *par
     if (!qobject_cast<QMenu*>(w) && (!parentWidget || !container)) {
         m_formWindow->manageWidget(w);
         if (parentWidget) {
-            QList<QWidget *> list = qvariant_cast<QWidgetList>(parentWidget->property("_q_widgetOrder"));
+            QWidgetList list = qvariant_cast<QWidgetList>(parentWidget->property("_q_widgetOrder"));
             list.append(w);
             parentWidget->setProperty("_q_widgetOrder", QVariant::fromValue(list));
-            QList<QWidget *> zOrder = qvariant_cast<QWidgetList>(parentWidget->property("_q_zOrder"));
+            QWidgetList zOrder = qvariant_cast<QWidgetList>(parentWidget->property("_q_zOrder"));
             zOrder.append(w);
             parentWidget->setProperty("_q_zOrder", QVariant::fromValue(zOrder));
         }
@@ -1245,7 +1245,7 @@ void QDesignerResource::applyTabStops(QWidget *widget, DomTabStops *tabStops)
     if (!tabStops)
         return;
 
-    QList<QWidget*> tabOrder;
+    QWidgetList tabOrder;
     const QStringList &elementTabStop = tabStops->elementTabStop();
     for (const QString &widgetName : elementTabStop) {
         if (QWidget *w = widget->findChild<QWidget*>(widgetName)) {
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.h b/src/designer/src/components/formeditor/qmainwindow_container.h
index 6bb8c08bf..b0c2d1677 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.h
+++ b/src/designer/src/components/formeditor/qmainwindow_container.h
@@ -57,7 +57,7 @@ public:
 
 private:
     QMainWindow *m_mainWindow;
-    QList<QWidget*> m_widgets;
+    QWidgetList m_widgets;
 };
 
 typedef ExtensionFactory<QDesignerContainerExtension, QMainWindow, QMainWindowContainer> QMainWindowContainerFactory;
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
index 05610f175..0a658a86b 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -335,7 +335,7 @@ void WidgetEditorTool::activated()
     if (m_formWindow == 0)
         return;
 
-    const QList<QWidget*> &sel = m_formWindow->selectedWidgets();
+    const QWidgetList &sel = m_formWindow->selectedWidgets();
     for (QWidget *w : sel)
         m_formWindow->raiseSelection(w);
 }
diff --git a/src/designer/src/components/tabordereditor/tabordereditor.cpp b/src/designer/src/components/tabordereditor/tabordereditor.cpp
index 45a4b5ef0..936591ce1 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor.cpp
+++ b/src/designer/src/components/tabordereditor/tabordereditor.cpp
@@ -222,7 +222,7 @@ void TabOrderEditor::initTabOrder()
     }
 
     // Append any widgets that are in the form but are not in the tab order
-    QList<QWidget *> childQueue;
+    QWidgetList childQueue;
     childQueue.append(formWindow()->mainContainer());
     while (!childQueue.isEmpty()) {
         QWidget *child = childQueue.takeFirst();
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index b85b49c0b..f35c7ceb0 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -622,7 +622,7 @@ void QDesignerWorkbench::removeFormWindow(QDesignerFormWindow *formWindow)
 
 void QDesignerWorkbench::initializeCorePlugins()
 {
-    QList<QObject*> plugins = QPluginLoader::staticInstances();
+    QObjectList plugins = QPluginLoader::staticInstances();
     plugins += core()->pluginManager()->instances();
 
     for (QObject *plugin : qAsConst(plugins)) {
diff --git a/src/designer/src/lib/shared/metadatabase.cpp b/src/designer/src/lib/shared/metadatabase.cpp
index 59b0fd024..bf3ad5c68 100644
--- a/src/designer/src/lib/shared/metadatabase.cpp
+++ b/src/designer/src/lib/shared/metadatabase.cpp
@@ -77,12 +77,12 @@ void MetaDataBaseItem::setCustomClassName(const QString &customClassName)
 }
 
 
-MetaDataBaseItem::TabOrder  MetaDataBaseItem::tabOrder() const
+QWidgetList MetaDataBaseItem::tabOrder() const
 {
     return m_tabOrder;
 }
 
-void MetaDataBaseItem::setTabOrder(const TabOrder &tabOrder)
+void MetaDataBaseItem::setTabOrder(const QWidgetList &tabOrder)
 {
     m_tabOrder = tabOrder;
 }
@@ -168,9 +168,9 @@ void MetaDataBase::remove(QObject *object)
     }
 }
 
-QList<QObject*> MetaDataBase::objects() const
+QObjectList MetaDataBase::objects() const
 {
-    QList<QObject*> result;
+    QObjectList result;
 
     ItemMap::const_iterator it = m_items.begin();
     for (; it != m_items.end(); ++it) {
diff --git a/src/designer/src/lib/shared/metadatabase_p.h b/src/designer/src/lib/shared/metadatabase_p.h
index 33366a5c7..5770b4201 100644
--- a/src/designer/src/lib/shared/metadatabase_p.h
+++ b/src/designer/src/lib/shared/metadatabase_p.h
@@ -61,9 +61,8 @@ public:
     QString name() const Q_DECL_OVERRIDE;
     void setName(const QString &name) Q_DECL_OVERRIDE;
 
-    typedef QList<QWidget*> TabOrder;
-    TabOrder tabOrder() const Q_DECL_OVERRIDE;
-    void setTabOrder(const TabOrder &tabOrder) Q_DECL_OVERRIDE;
+    QWidgetList tabOrder() const Q_DECL_OVERRIDE;
+    void setTabOrder(const QWidgetList &tabOrder) Q_DECL_OVERRIDE;
 
     bool enabled() const Q_DECL_OVERRIDE;
     void setEnabled(bool b) Q_DECL_OVERRIDE;
@@ -79,7 +78,7 @@ public:
 
 private:
     QObject *m_object;
-    TabOrder m_tabOrder;
+    QWidgetList m_tabOrder;
     bool m_enabled;
     QString m_customClassName;
     QStringList m_fakeSlots;
@@ -100,7 +99,7 @@ public:
     void add(QObject *object) Q_DECL_OVERRIDE;
     void remove(QObject *object) Q_DECL_OVERRIDE;
 
-    QList<QObject*> objects() const Q_DECL_OVERRIDE;
+    QObjectList objects() const Q_DECL_OVERRIDE;
 
 private slots:
     void slotDestroyed(QObject *object);
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index 24e8d072e..c83bc91ac 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -493,7 +493,7 @@ void DeleteWidgetCommand::redo()
     m_widget->hide();
 
     if (m_tabOrderIndex != -1) {
-        QList<QWidget*> tab_order = m_formItem->tabOrder();
+        QWidgetList tab_order = m_formItem->tabOrder();
         tab_order.removeAt(m_tabOrderIndex);
         m_formItem->setTabOrder(tab_order);
     }
@@ -542,7 +542,7 @@ void DeleteWidgetCommand::undo()
     m_widget->show();
 
     if (m_tabOrderIndex != -1) {
-        QList<QWidget*> tab_order = m_formItem->tabOrder();
+        QWidgetList tab_order = m_formItem->tabOrder();
         tab_order.insert(m_tabOrderIndex, m_widget);
         m_formItem->setTabOrder(tab_order);
     }
@@ -1437,7 +1437,7 @@ TabOrderCommand::TabOrderCommand(QDesignerFormWindowInterface *formWindow)
 {
 }
 
-void TabOrderCommand::init(const QList<QWidget*> &newTabOrder)
+void TabOrderCommand::init(const QWidgetList &newTabOrder)
 {
     QDesignerFormEditorInterface *core = formWindow()->core();
     Q_ASSERT(core);
diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h
index 50075b503..7b9d4ed71 100644
--- a/src/designer/src/lib/shared/qdesigner_command_p.h
+++ b/src/designer/src/lib/shared/qdesigner_command_p.h
@@ -127,7 +127,7 @@ protected:
 private:
     QPointer<QWidget> m_widget;
     QPointer<QWidget> m_oldPreceding;
-    QList<QWidget *> m_oldParentZOrder;
+    QWidgetList m_oldParentZOrder;
 };
 
 class QDESIGNER_SHARED_EXPORT RaiseWidgetCommand: public ChangeZOrderCommand
@@ -242,8 +242,8 @@ private:
     QPoint m_newPos;
     QPointer<QWidget> m_oldParentWidget;
     QPointer<QWidget> m_newParentWidget;
-    QList<QWidget *> m_oldParentList;
-    QList<QWidget *> m_oldParentZOrder;
+    QWidgetList m_oldParentList;
+    QWidgetList m_oldParentZOrder;
 };
 
 class QDESIGNER_SHARED_EXPORT ChangeFormLayoutItemRoleCommand : public QDesignerFormWindowCommand
@@ -296,12 +296,12 @@ class QDESIGNER_SHARED_EXPORT TabOrderCommand: public QDesignerFormWindowCommand
 public:
     explicit TabOrderCommand(QDesignerFormWindowInterface *formWindow);
 
-    void init(const QList<QWidget*> &newTabOrder);
+    void init(const QWidgetList &newTabOrder);
 
-    inline QList<QWidget*> oldTabOrder() const
+    inline QWidgetList oldTabOrder() const
     { return m_oldTabOrder; }
 
-    inline QList<QWidget*> newTabOrder() const
+    inline QWidgetList newTabOrder() const
     { return m_newTabOrder; }
 
     virtual void redo();
@@ -309,8 +309,8 @@ public:
 
 private:
     QDesignerMetaDataBaseItemInterface *m_widgetItem;
-    QList<QWidget*> m_oldTabOrder;
-    QList<QWidget*> m_newTabOrder;
+    QWidgetList m_oldTabOrder;
+    QWidgetList m_newTabOrder;
 };
 
 class QDESIGNER_SHARED_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand
diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp
index 13f055ae2..a1e2acd42 100644
--- a/src/designer/src/lib/shared/qdesigner_promotion.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp
@@ -252,10 +252,9 @@ namespace qdesigner_internal {
         if (!metaDataBase)
             return rc;
 
-        const QList<QObject*> objs = metaDataBase->objects();
-        const QList<QObject*>::const_iterator cend = objs.constEnd();
-        for ( QList<QObject*>::const_iterator it = objs.constBegin(); it != cend; ++it) {
-            const QString customClass = metaDataBase->metaDataBaseItem(*it)->customClassName();
+        const QObjectList &objects = metaDataBase->objects();
+        for (QObject *object : objects) {
+            const QString customClass = metaDataBase->metaDataBaseItem(object)->customClassName();
             if (!customClass.isEmpty())
                 rc.insert(customClass);
 
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
index bce74ecb0..6c7417f81 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -1358,7 +1358,7 @@ AddDynamicPropertyCommand::AddDynamicPropertyCommand(QDesignerFormWindowInterfac
 
 }
 
-bool AddDynamicPropertyCommand::init(const QList<QObject *> &selection, QObject *current,
+bool AddDynamicPropertyCommand::init(const QObjectList &selection, QObject *current,
             const QString &propertyName, const QVariant &value)
 {
     Q_ASSERT(current);
@@ -1437,7 +1437,7 @@ RemoveDynamicPropertyCommand::RemoveDynamicPropertyCommand(QDesignerFormWindowIn
 
 }
 
-bool RemoveDynamicPropertyCommand::init(const QList<QObject *> &selection, QObject *current,
+bool RemoveDynamicPropertyCommand::init(const QObjectList &selection, QObject *current,
             const QString &propertyName)
 {
     Q_ASSERT(current);
diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h
index facdafe53..5893114d6 100644
--- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h
+++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h
@@ -44,6 +44,8 @@
 #include "extensionfactory_p.h"
 #include <QtDesigner/QDesignerTaskMenuExtension>
 
+#include <QtGui/qwindowdefs.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 #include <QtCore/QList>
@@ -53,8 +55,6 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
 class QDesignerFormEditorInterface;
 
-class QWidget;
-
 namespace qdesigner_internal {
 class QDesignerTaskMenuPrivate;
 
@@ -87,7 +87,7 @@ protected:
      * an unmanaged widget [as of 4.5], in which case it must not use the cursor selection,
      * but the unmanaged selection of the object inspector. */
     QObjectList applicableObjects(const QDesignerFormWindowInterface *fw, PropertyMode pm) const;
-    QList<QWidget *> applicableWidgets(const QDesignerFormWindowInterface *fw, PropertyMode pm) const;
+    QWidgetList applicableWidgets(const QDesignerFormWindowInterface *fw, PropertyMode pm) const;
 
     void setProperty(QDesignerFormWindowInterface *fw, PropertyMode pm, const QString &name, const QVariant &newValue);
 
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index 23a31a6dd..ff30b2454 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -1432,12 +1432,12 @@ int QLayoutSupport::indexOf(QWidget *widget) const
     return -1;
 }
 
-QList<QWidget*> QLayoutSupport::widgets(QLayout *layout) const
+QWidgetList QLayoutSupport::widgets(QLayout *layout) const
 {
     if (!layout)
-        return QList<QWidget*>();
+        return QWidgetList();
 
-    QList<QWidget*> lst;
+    QWidgetList lst;
     int index = 0;
     while (QLayoutItem *item = layout->itemAt(index)) {
         ++index;
diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h
index 23c096759..2ff849d24 100644
--- a/src/designer/src/lib/shared/qlayout_widget_p.h
+++ b/src/designer/src/lib/shared/qlayout_widget_p.h
@@ -188,7 +188,7 @@ public:
 
     void adjustIndicator(const QPoint &pos, int index) Q_DECL_OVERRIDE;
 
-    QList<QWidget*> widgets(QLayout *layout) const Q_DECL_OVERRIDE;
+    QWidgetList widgets(QLayout *layout) const Q_DECL_OVERRIDE;
 
     // Pad empty cells with dummy spacers. Called by layouting commands.
     static void createEmptyCells(QGridLayout *gridLayout);
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 8bac11285..d3cf821ea 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -397,7 +397,7 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
 
     const QStringList zOrderNames = ui_widget->elementZOrder();
     if (!zOrderNames.isEmpty()) {
-        QList<QWidget *> zOrder = qvariant_cast<QWidgetList>(w->property("_q_zOrder"));
+        QWidgetList zOrder = qvariant_cast<QWidgetList>(w->property("_q_zOrder"));
         for (const QString &widgetName : zOrderNames) {
             if (QWidget *child = w->findChild<QWidget*>(widgetName)) {
                 if (child->parentWidget() == w) {
@@ -1364,7 +1364,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
     QList<DomAction*> ui_actions;
     QList<DomActionGroup*> ui_action_groups;
 
-    QList<QObject*> children;
+    QObjectList children;
 
     // splitters need to store their children in the order specified by child indexes,
     // not the order of the child list.
@@ -1376,9 +1376,9 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
     } else
 #endif
     {
-        QList<QObject *> childObjects = widget->children();
+        QObjectList childObjects = widget->children();
 
-        const QList<QWidget *> list = qvariant_cast<QWidgetList>(widget->property("_q_widgetOrder"));
+        const QWidgetList list = qvariant_cast<QWidgetList>(widget->property("_q_widgetOrder"));
         for (QWidget *w : list) {
             if (childObjects.contains(w)) {
                 children.append(w);
@@ -1387,7 +1387,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
         }
         children += childObjects;
 
-        const QList<QWidget *> zOrder = qvariant_cast<QWidgetList>(widget->property("_q_zOrder"));
+        const QWidgetList zOrder = qvariant_cast<QWidgetList>(widget->property("_q_zOrder"));
         if (list != zOrder) {
             QStringList zOrderList;
             zOrderList.reserve(zOrder.size());
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp
index a87449faf..de852a740 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -1965,7 +1965,7 @@ public:
 
     QMap<QtProperty *, QtProperty *> m_propertyToEnum;
     QMap<QtProperty *, QtProperty *> m_enumToProperty;
-    QMap<QtProperty *, QList<QWidget *> > m_enumToEditors;
+    QMap<QtProperty *, QWidgetList > m_enumToEditors;
     QMap<QWidget *, QtProperty *> m_editorToEnum;
     bool m_updatingEnum;
 };