Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6

Test failures:
  shiboken2:testmodifyfunction
  pyside2:QtCore::qbytearray_test
  pyside2:QtGui::bug_PYSIDE-41
  pyside2:QtGui::deepcopy_test
  pyside2:QtGui::qfontmetrics_test
  pyside2:QtGui::qpixmapcache_test
  pyside2:QtWidgets::api2_test (QTBUG-85417)
  pyside2:QtWidgets::bug_632
  pyside2:QtWidgets::bug_714
  pyside2:QtWidgets::bug_785
  pyside2:QtWidgets::qshortcut_test
  pyside2:QtQml::bug_825
  pyside2:QtQml::bug_1029
  pyside2:QtQml::registertype
  pyside2:QtQml::qqmlincubator_incubateWhile
  pyside2:QtQml::signal_arguments

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335
Reviewed-by: Christian Tismer <tismer@stackless.com>

18 files changed, 64 insertions, 312 deletions

diff --git a/examples/axcontainer/axviewer.py b/examples/axcontainer/axviewer.py
index e9083d8f4..50e50ee1c 100644
--- a/examples/axcontainer/axviewer.py
+++ b/examples/axcontainer/axviewer.py
@@ -43,7 +43,8 @@
 
 import sys
 from PySide2.QtAxContainer import QAxSelect, QAxWidget
-from PySide2.QtWidgets import (QAction, QApplication, QDialog,
+from PySide2.QtGui import QAction
+from PySide2.QtWidgets import (QApplication, QDialog,
     QMainWindow, QMessageBox, QToolBar)
 
 class MainWindow(QMainWindow):
diff --git a/examples/corelib/tools/codecs/codecs.py b/examples/corelib/tools/codecs/codecs.py
deleted file mode 100644
index a3c063c04..000000000
--- a/examples/corelib/tools/codecs/codecs.py
+++ /dev/null
@@ -1,250 +0,0 @@
-
-#############################################################################
-##
-## Copyright (C) 2013 Riverbank Computing Limited.
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Qt for Python examples of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:BSD$
-## You may use this file under the terms of the BSD license as follows:
-##
-## "Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions are
-## met:
-##   * Redistributions of source code must retain the above copyright
-##     notice, this list of conditions and the following disclaimer.
-##   * Redistributions in binary form must reproduce the above copyright
-##     notice, this list of conditions and the following disclaimer in
-##     the documentation and/or other materials provided with the
-##     distribution.
-##   * Neither the name of The Qt Company Ltd nor the names of its
-##     contributors may be used to endorse or promote products derived
-##     from this software without specific prior written permission.
-##
-##
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-"""PySide2 port of the widgets/tools/codecs example from Qt v5.x"""
-
-from PySide2 import QtCore, QtWidgets
-
-
-def codec_name(codec):
-    try:
-        # Python v3.
-        name = str(codec.name(), encoding='ascii')
-    except TypeError:
-        # Python v2.
-        name = str(codec.name())
-
-    return name
-
-
-class MainWindow(QtWidgets.QMainWindow):
-    def __init__(self):
-        super(MainWindow, self).__init__()
-
-        self.textEdit = QtWidgets.QTextEdit()
-        self.textEdit.setLineWrapMode(QtWidgets.QTextEdit.NoWrap)
-        self.setCentralWidget(self.textEdit)
-
-        self.codecs = []
-        self.findCodecs()
-
-        self.previewForm = PreviewForm(self)
-        self.previewForm.setCodecList(self.codecs)
-
-        self.saveAsActs = []
-        self.createActions()
-        self.createMenus()
-
-        self.setWindowTitle("Codecs")
-        self.resize(500, 400)
-
-    def open(self):
-        fileName, _ = QtWidgets.QFileDialog.getOpenFileName(self)
-        if fileName:
-            inFile = QtCore.QFile(fileName)
-            if not inFile.open(QtCore.QFile.ReadOnly):
-                QtWidgets.QMessageBox.warning(self, "Codecs",
-                        "Cannot read file %s:\n%s" % (fileName, inFile.errorString()))
-                return
-
-            data = inFile.readAll()
-
-            self.previewForm.setEncodedData(data)
-            if self.previewForm.exec_():
-                self.textEdit.setPlainText(self.previewForm.decodedString())
-
-    def save(self):
-        fileName = QtWidgets.QFileDialog.getSaveFileName(self)
-        if fileName:
-            outFile = QtCore.QFile(fileName)
-            if not outFile.open(QtCore.QFile.WriteOnly|QtCore.QFile.Text):
-                QtWidgets.QMessageBox.warning(self, "Codecs",
-                        "Cannot write file %s:\n%s" % (fileName, outFile.errorString()))
-                return
-
-            action = self.sender()
-            codecName = action.data()
-
-            out = QtCore.QTextStream(outFile)
-            out.setCodec(codecName)
-            out << self.textEdit.toPlainText()
-
-    def about(self):
-        QtWidgets.QMessageBox.about(self, "About Codecs",
-                "The <b>Codecs</b> example demonstrates how to read and "
-                "write files using various encodings.")
-
-    def aboutToShowSaveAsMenu(self):
-        currentText = self.textEdit.toPlainText()
-
-        for action in self.saveAsActs:
-            codecName = str(action.data())
-            codec = QtCore.QTextCodec.codecForName(codecName)
-            action.setVisible(codec and codec.canEncode(currentText))
-
-    def findCodecs(self):
-        codecMap = []
-        iso8859RegExp = QtCore.QRegExp('ISO[- ]8859-([0-9]+).*')
-
-        for mib in QtCore.QTextCodec.availableMibs():
-            codec = QtCore.QTextCodec.codecForMib(mib)
-            sortKey = codec_name(codec).upper()
-            rank = 0
-
-            if sortKey.startswith('UTF-8'):
-                rank = 1
-            elif sortKey.startswith('UTF-16'):
-                rank = 2
-            elif iso8859RegExp.exactMatch(sortKey):
-                if len(iso8859RegExp.cap(1)) == 1:
-                    rank = 3
-                else:
-                    rank = 4
-            else:
-                rank = 5
-
-            codecMap.append((str(rank) + sortKey, codec))
-
-        codecMap.sort()
-        self.codecs = [item[-1] for item in codecMap]
-
-    def createActions(self):
-        self.openAct = QtWidgets.QAction("&Open...", self, shortcut="Ctrl+O",
-                triggered=self.open)
-
-        for codec in self.codecs:
-            name = codec_name(codec)
-
-            action = QtWidgets.QAction(name + '...', self, triggered=self.save)
-            action.setData(name)
-            self.saveAsActs.append(action)
-
-        self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q",
-                triggered=self.close)
-
-        self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
-
-        self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
-                triggered=qApp.aboutQt)
-
-    def createMenus(self):
-        self.saveAsMenu = QtWidgets.QMenu("&Save As", self)
-        for action in self.saveAsActs:
-            self.saveAsMenu.addAction(action)
-
-        self.saveAsMenu.aboutToShow.connect(self.aboutToShowSaveAsMenu)
-
-        self.fileMenu = QtWidgets.QMenu("&File", self)
-        self.fileMenu.addAction(self.openAct)
-        self.fileMenu.addMenu(self.saveAsMenu)
-        self.fileMenu.addSeparator()
-        self.fileMenu.addAction(self.exitAct)
-
-        self.helpMenu = QtWidgets.QMenu("&Help", self)
-        self.helpMenu.addAction(self.aboutAct)
-        self.helpMenu.addAction(self.aboutQtAct)
-
-        self.menuBar().addMenu(self.fileMenu)
-        self.menuBar().addSeparator()
-        self.menuBar().addMenu(self.helpMenu)
-
-
-class PreviewForm(QtWidgets.QDialog):
-    def __init__(self, parent):
-        super(PreviewForm, self).__init__(parent)
-
-        self.encodingComboBox = QtWidgets.QComboBox()
-        encodingLabel = QtWidgets.QLabel("&Encoding:")
-        encodingLabel.setBuddy(self.encodingComboBox)
-
-        self.textEdit = QtWidgets.QTextEdit()
-        self.textEdit.setLineWrapMode(QtWidgets.QTextEdit.NoWrap)
-        self.textEdit.setReadOnly(True)
-
-        buttonBox = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel)
-
-        self.encodingComboBox.activated.connect(self.updateTextEdit)
-        buttonBox.accepted.connect(self.accept)
-        buttonBox.rejected.connect(self.reject)
-
-        mainLayout = QtWidgets.QGridLayout()
-        mainLayout.addWidget(encodingLabel, 0, 0)
-        mainLayout.addWidget(self.encodingComboBox, 0, 1)
-        mainLayout.addWidget(self.textEdit, 1, 0, 1, 2)
-        mainLayout.addWidget(buttonBox, 2, 0, 1, 2)
-        self.setLayout(mainLayout)
-
-        self.setWindowTitle("Choose Encoding")
-        self.resize(400, 300)
-
-    def setCodecList(self, codecs):
-        self.encodingComboBox.clear()
-        for codec in codecs:
-            self.encodingComboBox.addItem(codec_name(codec), codec.mibEnum())
-
-    def setEncodedData(self, data):
-        self.encodedData = data
-        self.updateTextEdit()
-
-    def decodedString(self):
-        return self.decodedStr
-
-    def updateTextEdit(self):
-        mib = self.encodingComboBox.itemData(self.encodingComboBox.currentIndex())
-        codec = QtCore.QTextCodec.codecForMib(mib)
-
-        data = QtCore.QTextStream(self.encodedData)
-        data.setAutoDetectUnicode(False)
-        data.setCodec(codec)
-
-        self.decodedStr = data.readAll()
-        self.textEdit.setPlainText(self.decodedStr)
-
-
-if __name__ == '__main__':
-
-    import sys
-
-    app = QtWidgets.QApplication(sys.argv)
-    mainWin = MainWindow()
-    mainWin.show()
-    sys.exit(app.exec_())
diff --git a/examples/corelib/tools/settingseditor/settingseditor.py b/examples/corelib/tools/settingseditor/settingseditor.py
index 4cd262568..5b141880a 100644
--- a/examples/corelib/tools/settingseditor/settingseditor.py
+++ b/examples/corelib/tools/settingseditor/settingseditor.py
@@ -111,41 +111,41 @@ class MainWindow(QtWidgets.QMainWindow):
                 "application settings using Qt.")
 
     def createActions(self):
-        self.openSettingsAct = QtWidgets.QAction("&Open Application Settings...",
+        self.openSettingsAct = QtGui.QAction("&Open Application Settings...",
                 self, shortcut="Ctrl+O", triggered=self.openSettings)
 
-        self.openIniFileAct = QtWidgets.QAction("Open I&NI File...", self,
+        self.openIniFileAct = QtGui.QAction("Open I&NI File...", self,
                 shortcut="Ctrl+N", triggered=self.openIniFile)
 
-        self.openPropertyListAct = QtWidgets.QAction("Open macOS &Property List...",
+        self.openPropertyListAct = QtGui.QAction("Open macOS &Property List...",
                 self, shortcut="Ctrl+P", triggered=self.openPropertyList)
         if sys.platform != 'darwin':
             self.openPropertyListAct.setEnabled(False)
 
-        self.openRegistryPathAct = QtWidgets.QAction(
+        self.openRegistryPathAct = QtGui.QAction(
                 "Open Windows &Registry Path...", self, shortcut="Ctrl+G",
                 triggered=self.openRegistryPath)
         if sys.platform != 'win32':
             self.openRegistryPathAct.setEnabled(False)
 
-        self.refreshAct = QtWidgets.QAction("&Refresh", self, shortcut="Ctrl+R",
+        self.refreshAct = QtGui.QAction("&Refresh", self, shortcut="Ctrl+R",
                 enabled=False, triggered=self.settingsTree.refresh)
 
-        self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q",
+        self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q",
                 triggered=self.close)
 
-        self.autoRefreshAct = QtWidgets.QAction("&Auto-Refresh", self,
+        self.autoRefreshAct = QtGui.QAction("&Auto-Refresh", self,
                 shortcut="Ctrl+A", checkable=True, enabled=False)
         self.autoRefreshAct.triggered[bool].connect(self.settingsTree.setAutoRefresh)
         self.autoRefreshAct.triggered[bool].connect(self.refreshAct.setDisabled)
 
-        self.fallbacksAct = QtWidgets.QAction("&Fallbacks", self,
+        self.fallbacksAct = QtGui.QAction("&Fallbacks", self,
                 shortcut="Ctrl+F", checkable=True, enabled=False)
         self.fallbacksAct.triggered[bool].connect(self.settingsTree.setFallbacksEnabled)
 
-        self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
+        self.aboutAct = QtGui.QAction("&About", self, triggered=self.about)
 
-        self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
+        self.aboutQtAct = QtGui.QAction("About &Qt", self,
                 triggered=qApp.aboutQt)
 
     def createMenus(self):
diff --git a/examples/external/matplotlib/widget_3dplot.py b/examples/external/matplotlib/widget_3dplot.py
index b96405661..6f47da31b 100644
--- a/examples/external/matplotlib/widget_3dplot.py
+++ b/examples/external/matplotlib/widget_3dplot.py
@@ -45,8 +45,8 @@ from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.figure import Figure
 from mpl_toolkits.mplot3d import axes3d
 from PySide2.QtCore import Qt, Slot
-from PySide2.QtGui import QKeySequence
-from PySide2.QtWidgets import (QAction, QApplication, QComboBox, QHBoxLayout,
+from PySide2.QtGui import QAction, QKeySequence
+from PySide2.QtWidgets import (QApplication, QComboBox, QHBoxLayout,
                                QHeaderView, QLabel, QMainWindow, QSlider,
                                QTableWidget, QTableWidgetItem, QVBoxLayout,
                                QWidget)
diff --git a/examples/external/opencv/webcam_pattern_detection.py b/examples/external/opencv/webcam_pattern_detection.py
index 553261615..664ba2111 100644
--- a/examples/external/opencv/webcam_pattern_detection.py
+++ b/examples/external/opencv/webcam_pattern_detection.py
@@ -44,8 +44,8 @@ import time
 
 import cv2
 from PySide2.QtCore import Qt, QThread, Signal, Slot
-from PySide2.QtGui import QImage, QKeySequence, QPixmap
-from PySide2.QtWidgets import (QAction, QApplication, QComboBox, QGroupBox,
+from PySide2.QtGui import QAction, QImage, QKeySequence, QPixmap
+from PySide2.QtWidgets import (QApplication, QComboBox, QGroupBox,
                                QHBoxLayout, QLabel, QMainWindow, QPushButton,
                                QSizePolicy, QVBoxLayout, QWidget)
 
diff --git a/examples/external/scikit/staining_colors_separation.py b/examples/external/scikit/staining_colors_separation.py
index 051b2bc25..d21453927 100644
--- a/examples/external/scikit/staining_colors_separation.py
+++ b/examples/external/scikit/staining_colors_separation.py
@@ -45,8 +45,8 @@ from matplotlib.backends.backend_qt5agg import FigureCanvas
 from matplotlib.colors import LinearSegmentedColormap
 from matplotlib.figure import Figure
 from PySide2.QtCore import Qt, Slot
-from PySide2.QtGui import QKeySequence
-from PySide2.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel,
+from PySide2.QtGui import QAction, QKeySequence
+from PySide2.QtWidgets import (QApplication, QHBoxLayout, QLabel,
                                QMainWindow, QPushButton, QSizePolicy,
                                QVBoxLayout, QWidget)
 from skimage import data
diff --git a/examples/multimedia/camera.py b/examples/multimedia/camera.py
index d58b526d9..644b5340c 100644
--- a/examples/multimedia/camera.py
+++ b/examples/multimedia/camera.py
@@ -43,9 +43,9 @@
 
 import os, sys
 from PySide2.QtCore import QDate, QDir, QStandardPaths, Qt, QUrl
-from PySide2.QtGui import QGuiApplication, QDesktopServices, QIcon
+from PySide2.QtGui import QAction, QGuiApplication, QDesktopServices, QIcon
 from PySide2.QtGui import QImage, QPixmap
-from PySide2.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel,
+from PySide2.QtWidgets import (QApplication, QHBoxLayout, QLabel,
     QMainWindow, QPushButton, QTabWidget, QToolBar, QVBoxLayout, QWidget)
 from PySide2.QtMultimedia import QCamera, QCameraImageCapture, QCameraInfo
 from PySide2.QtMultimediaWidgets import QCameraViewfinder
diff --git a/examples/multimedia/player.py b/examples/multimedia/player.py
index 454f852ce..762d26b7e 100644
--- a/examples/multimedia/player.py
+++ b/examples/multimedia/player.py
@@ -43,8 +43,8 @@
 
 import sys
 from PySide2.QtCore import QStandardPaths, Qt
-from PySide2.QtGui import QIcon, QKeySequence
-from PySide2.QtWidgets import (QAction, QApplication, QDialog, QFileDialog,
+from PySide2.QtGui import QAction, QIcon, QKeySequence
+from PySide2.QtWidgets import (QApplication, QDialog, QFileDialog,
     QMainWindow, QSlider, QStyle, QToolBar)
 from PySide2.QtMultimedia import QMediaPlayer, QMediaPlaylist
 from PySide2.QtMultimediaWidgets import QVideoWidget
diff --git a/examples/opengl/grabber.py b/examples/opengl/grabber.py
index d4b625718..9b5358a85 100644
--- a/examples/opengl/grabber.py
+++ b/examples/opengl/grabber.py
@@ -355,21 +355,21 @@ class MainWindow(QtWidgets.QMainWindow):
                 "rendering OpenGL into a Qt pixmap.")
 
     def createActions(self):
-        self.renderIntoPixmapAct = QtWidgets.QAction("&Render into Pixmap...",
+        self.renderIntoPixmapAct = QtGui.QAction("&Render into Pixmap...",
                 self, shortcut="Ctrl+R", triggered=self.renderIntoPixmap)
 
-        self.grabFrameBufferAct = QtWidgets.QAction("&Grab Frame Buffer", self,
+        self.grabFrameBufferAct = QtGui.QAction("&Grab Frame Buffer", self,
                 shortcut="Ctrl+G", triggered=self.grabFrameBuffer)
 
-        self.clearPixmapAct = QtWidgets.QAction("&Clear Pixmap", self,
+        self.clearPixmapAct = QtGui.QAction("&Clear Pixmap", self,
                 shortcut="Ctrl+L", triggered=self.clearPixmap)
 
-        self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q",
+        self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q",
                 triggered=self.close)
 
-        self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
+        self.aboutAct = QtGui.QAction("&About", self, triggered=self.about)
 
-        self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
+        self.aboutQtAct = QtGui.QAction("About &Qt", self,
                 triggered=qApp.aboutQt)
 
     def createMenus(self):
diff --git a/examples/scriptableapplication/mainwindow.cpp b/examples/scriptableapplication/mainwindow.cpp
index ef4a2f2e0..0811990de 100644
--- a/examples/scriptableapplication/mainwindow.cpp
+++ b/examples/scriptableapplication/mainwindow.cpp
@@ -51,7 +51,7 @@
 #include "mainwindow.h"
 #include "pythonutils.h"
 
-#include <QtWidgets/QAction>
+#include <QtGui.QAction>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMenuBar>
diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py
index 438dd5c9d..086946bac 100644
--- a/examples/webenginewidgets/tabbedbrowser/main.py
+++ b/examples/webenginewidgets/tabbedbrowser/main.py
@@ -49,8 +49,8 @@ from findtoolbar import FindToolBar
 from webengineview import WebEngineView
 from PySide2 import QtCore
 from PySide2.QtCore import Qt, QUrl
-from PySide2.QtGui import QKeySequence, QIcon
-from PySide2.QtWidgets import (QAction, QApplication, QDockWidget, QLabel,
+from PySide2.QtGui import QAction, QKeySequence, QIcon
+from PySide2.QtWidgets import (QApplication, QDockWidget, QLabel,
                                QLineEdit, QMainWindow, QToolBar)
 from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage
 
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py
index 3890782c4..048681bdb 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramscene.py
+++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py
@@ -607,38 +607,38 @@ class MainWindow(QtWidgets.QMainWindow):
         self.toolBox.addItem(backgroundWidget, "Backgrounds")
 
     def createActions(self):
-        self.toFrontAction = QtWidgets.QAction(
+        self.toFrontAction = QtGui.QAction(
                 QtGui.QIcon(':/images/bringtofront.png'), "Bring to &Front",
                 self, shortcut="Ctrl+F", statusTip="Bring item to front",
                 triggered=self.bringToFront)
 
-        self.sendBackAction = QtWidgets.QAction(
+        self.sendBackAction = QtGui.QAction(
                 QtGui.QIcon(':/images/sendtoback.png'), "Send to &Back", self,
                 shortcut="Ctrl+B", statusTip="Send item to back",
                 triggered=self.sendToBack)
 
-        self.deleteAction = QtWidgets.QAction(QtGui.QIcon(':/images/delete.png'),
+        self.deleteAction = QtGui.QAction(QtGui.QIcon(':/images/delete.png'),
                 "&Delete", self, shortcut="Delete",
                 statusTip="Delete item from diagram",
                 triggered=self.deleteItem)
 
-        self.exitAction = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+X",
+        self.exitAction = QtGui.QAction("E&xit", self, shortcut="Ctrl+X",
                 statusTip="Quit Scenediagram example", triggered=self.close)
 
-        self.boldAction = QtWidgets.QAction(QtGui.QIcon(':/images/bold.png'),
+        self.boldAction = QtGui.QAction(QtGui.QIcon(':/images/bold.png'),
                 "Bold", self, checkable=True, shortcut="Ctrl+B",
                 triggered=self.handleFontChange)
 
-        self.italicAction = QtWidgets.QAction(QtGui.QIcon(':/images/italic.png'),
+        self.italicAction = QtGui.QAction(QtGui.QIcon(':/images/italic.png'),
                 "Italic", self, checkable=True, shortcut="Ctrl+I",
                 triggered=self.handleFontChange)
 
-        self.underlineAction = QtWidgets.QAction(
+        self.underlineAction = QtGui.QAction(
                 QtGui.QIcon(':/images/underline.png'), "Underline", self,
                 checkable=True, shortcut="Ctrl+U",
                 triggered=self.handleFontChange)
 
-        self.aboutAction = QtWidgets.QAction("A&bout", self, shortcut="Ctrl+B",
+        self.aboutAction = QtGui.QAction("A&bout", self, shortcut="Ctrl+B",
                 triggered=self.about)
 
     def createMenus(self):
@@ -780,7 +780,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         colorMenu = QtWidgets.QMenu(self)
         for color, name in zip(colors, names):
-            action = QtWidgets.QAction(self.createColorIcon(color), name, self,
+            action = QtGui.QAction(self.createColorIcon(color), name, self,
                     triggered=slot)
             action.setData(QtGui.QColor(color))
             colorMenu.addAction(action)
diff --git a/examples/widgets/itemviews/addressbook/addressbook.py b/examples/widgets/itemviews/addressbook/addressbook.py
index 262027a64..35d095287 100644
--- a/examples/widgets/itemviews/addressbook/addressbook.py
+++ b/examples/widgets/itemviews/addressbook/addressbook.py
@@ -40,7 +40,8 @@
 ##
 #############################################################################
 
-from PySide2.QtWidgets import (QMainWindow, QAction, QFileDialog, QApplication)
+from PySide2.QtGui import QAction
+from PySide2.QtWidgets import (QMainWindow, QFileDialog, QApplication)
 
 from addresswidget import AddressWidget
 
diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py
index 8c4626f9b..d68e77b41 100644
--- a/examples/widgets/mainwindows/application/application.py
+++ b/examples/widgets/mainwindows/application/application.py
@@ -106,46 +106,46 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setWindowModified(self.textEdit.document().isModified())
 
     def createActions(self):
-        self.newAct = QtWidgets.QAction(QtGui.QIcon(':/images/new.png'), "&New",
+        self.newAct = QtGui.QAction(QtGui.QIcon(':/images/new.png'), "&New",
                 self, shortcut=QtGui.QKeySequence.New,
                 statusTip="Create a new file", triggered=self.newFile)
 
-        self.openAct = QtWidgets.QAction(QtGui.QIcon(':/images/open.png'),
+        self.openAct = QtGui.QAction(QtGui.QIcon(':/images/open.png'),
                 "&Open...", self, shortcut=QtGui.QKeySequence.Open,
                 statusTip="Open an existing file", triggered=self.open)
 
-        self.saveAct = QtWidgets.QAction(QtGui.QIcon(':/images/save.png'),
+        self.saveAct = QtGui.QAction(QtGui.QIcon(':/images/save.png'),
                 "&Save", self, shortcut=QtGui.QKeySequence.Save,
                 statusTip="Save the document to disk", triggered=self.save)
 
-        self.saveAsAct = QtWidgets.QAction("Save &As...", self,
+        self.saveAsAct = QtGui.QAction("Save &As...", self,
                 shortcut=QtGui.QKeySequence.SaveAs,
                 statusTip="Save the document under a new name",
                 triggered=self.saveAs)
 
-        self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q",
+        self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q",
                 statusTip="Exit the application", triggered=self.close)
 
-        self.cutAct = QtWidgets.QAction(QtGui.QIcon(':/images/cut.png'), "Cu&t",
+        self.cutAct = QtGui.QAction(QtGui.QIcon(':/images/cut.png'), "Cu&t",
                 self, shortcut=QtGui.QKeySequence.Cut,
                 statusTip="Cut the current selection's contents to the clipboard",
                 triggered=self.textEdit.cut)
 
-        self.copyAct = QtWidgets.QAction(QtGui.QIcon(':/images/copy.png'),
+        self.copyAct = QtGui.QAction(QtGui.QIcon(':/images/copy.png'),
                 "&Copy", self, shortcut=QtGui.QKeySequence.Copy,
                 statusTip="Copy the current selection's contents to the clipboard",
                 triggered=self.textEdit.copy)
 
-        self.pasteAct = QtWidgets.QAction(QtGui.QIcon(':/images/paste.png'),
+        self.pasteAct = QtGui.QAction(QtGui.QIcon(':/images/paste.png'),
                 "&Paste", self, shortcut=QtGui.QKeySequence.Paste,
                 statusTip="Paste the clipboard's contents into the current selection",
                 triggered=self.textEdit.paste)
 
-        self.aboutAct = QtWidgets.QAction("&About", self,
+        self.aboutAct = QtGui.QAction("&About", self,
                 statusTip="Show the application's About box",
                 triggered=self.about)
 
-        self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
+        self.aboutQtAct = QtGui.QAction("About &Qt", self,
                 statusTip="Show the Qt library's About box",
                 triggered=qApp.aboutQt)
 
diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py
index 53f6f7818..3f8e7dbf7 100644
--- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py
+++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py
@@ -43,10 +43,10 @@
 """PySide2 port of the widgets/mainwindows/dockwidgets example from Qt v5.x, originating from PyQt"""
 
 from PySide2.QtCore import QDate, QFile, Qt, QTextStream
-from PySide2.QtGui import (QFont, QIcon, QKeySequence, QTextCharFormat,
-        QTextCursor, QTextTableFormat)
+from PySide2.QtGui import (QAction, QFont, QIcon, QKeySequence,
+        QTextCharFormat, QTextTableFormat)
 from PySide2.QtPrintSupport import QPrintDialog, QPrinter
-from PySide2.QtWidgets import (QAction, QApplication, QDialog, QDockWidget,
+from PySide2.QtWidgets import (QApplication, QDialog, QDockWidget,
         QFileDialog, QListWidget, QMainWindow, QMessageBox, QTextEdit)
 
 import dockwidgets_rc
diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py
index 9daca826d..f9d90767e 100644
--- a/examples/widgets/mainwindows/mdi/mdi.py
+++ b/examples/widgets/mainwindows/mdi/mdi.py
@@ -44,8 +44,8 @@
 
 from PySide2.QtCore import (QFile, QFileInfo, QPoint, QSettings, QSignalMapper,
         QSaveFile, QSize, QTextStream, Qt)
-from PySide2.QtGui import QIcon, QKeySequence
-from PySide2.QtWidgets import (QAction, QApplication, QFileDialog, QMainWindow,
+from PySide2.QtGui import QAction, QIcon, QKeySequence
+from PySide2.QtWidgets import (QApplication, QFileDialog, QMainWindow,
         QMdiArea, QMessageBox, QTextEdit, QWidget)
 
 import mdi_rc
diff --git a/examples/widgets/systray/window.py b/examples/widgets/systray/window.py
index ca65f04e1..634646327 100644
--- a/examples/widgets/systray/window.py
+++ b/examples/widgets/systray/window.py
@@ -39,8 +39,8 @@
 #############################################################################
 
 from PySide2.QtCore import Slot
-from PySide2.QtGui import QIcon
-from PySide2.QtWidgets import (QAction, QCheckBox, QComboBox, QDialog,
+from PySide2.QtGui import QAction, QIcon
+from PySide2.QtWidgets import (QCheckBox, QComboBox, QDialog,
                                QGridLayout, QGroupBox, QHBoxLayout, QLabel,
                                QLineEdit, QMenu, QMessageBox, QPushButton,
                                QSpinBox, QStyle, QSystemTrayIcon, QTextEdit,
diff --git a/examples/xml/dombookmarks/dombookmarks.py b/examples/xml/dombookmarks/dombookmarks.py
index 20ec09e2d..f645bedce 100644
--- a/examples/xml/dombookmarks/dombookmarks.py
+++ b/examples/xml/dombookmarks/dombookmarks.py
@@ -100,18 +100,18 @@ class MainWindow(QtWidgets.QMainWindow):
             "DOM classes to read and write XML documents.")
 
     def createActions(self):
-        self.openAct = QtWidgets.QAction("&Open...", self, shortcut="Ctrl+O",
+        self.openAct = QtGui.QAction("&Open...", self, shortcut="Ctrl+O",
                 triggered=self.open)
 
-        self.saveAsAct = QtWidgets.QAction("&Save As...", self, shortcut="Ctrl+S",
+        self.saveAsAct = QtGui.QAction("&Save As...", self, shortcut="Ctrl+S",
                 triggered=self.saveAs)
 
-        self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q",
+        self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q",
                 triggered=self.close)
 
-        self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
+        self.aboutAct = QtGui.QAction("&About", self, triggered=self.about)
 
-        self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
+        self.aboutQtAct = QtGui.QAction("About &Qt", self,
                 triggered=qApp.aboutQt)
 
     def createMenus(self):