Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: I9d55ec493763dc9536d7926d428aecf75c10a72d

27 files changed, 30 insertions, 490 deletions

diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in
index 5dd82ed9f..99deb35e2 100644
--- a/sources/pyside2/PySide2/__init__.py.in
+++ b/sources/pyside2/PySide2/__init__.py.in
@@ -1,4 +1,6 @@
-__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
+__all__ = list("Qt" + body for body in
+    "@all_module_shortnames@"
+    .split(";"))
 __version__         = "@BINDING_API_VERSION_FULL@"
 __version_info__    = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @BINDING_API_MICRO_VERSION@, "@BINDING_API_RELEASE_LEVEL@", @BINDING_API_SERIAL@)
 
diff --git a/sources/pyside2/tests/QtConcurrent/CMakeLists.txt b/sources/pyside2/tests/QtConcurrent/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtConcurrent/CMakeLists.txt
+++ b/sources/pyside2/tests/QtConcurrent/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtDesigner/CMakeLists.txt b/sources/pyside2/tests/QtDesigner/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtDesigner/CMakeLists.txt
+++ b/sources/pyside2/tests/QtDesigner/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtDesigner/this_module_loads_test.py b/sources/pyside2/tests/QtDesigner/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtDesigner/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtMacExtras/CMakeLists.txt b/sources/pyside2/tests/QtMacExtras/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtMacExtras/CMakeLists.txt
+++ b/sources/pyside2/tests/QtMacExtras/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtMacExtras/this_module_loads_test.py b/sources/pyside2/tests/QtMacExtras/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtMacExtras/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtPrintSupport/CMakeLists.txt b/sources/pyside2/tests/QtPrintSupport/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtPrintSupport/CMakeLists.txt
+++ b/sources/pyside2/tests/QtPrintSupport/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtPrintSupport/this_module_loads_test.py b/sources/pyside2/tests/QtPrintSupport/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtPrintSupport/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtQuick/CMakeLists.txt b/sources/pyside2/tests/QtQuick/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtQuick/CMakeLists.txt
+++ b/sources/pyside2/tests/QtQuick/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtQuick/this_module_loads_test.py b/sources/pyside2/tests/QtQuick/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtQuick/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtQuickWidgets/CMakeLists.txt b/sources/pyside2/tests/QtQuickWidgets/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtQuickWidgets/CMakeLists.txt
+++ b/sources/pyside2/tests/QtQuickWidgets/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtQuickWidgets/this_module_loads_test.py b/sources/pyside2/tests/QtQuickWidgets/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtQuickWidgets/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtWebChannel/CMakeLists.txt b/sources/pyside2/tests/QtWebChannel/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtWebChannel/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWebChannel/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtWebChannel/this_module_loads_test.py b/sources/pyside2/tests/QtWebChannel/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtWebChannel/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtWebEngine/CMakeLists.txt b/sources/pyside2/tests/QtWebEngine/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtWebEngine/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWebEngine/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtWebEngine/this_module_loads_test.py b/sources/pyside2/tests/QtWebEngine/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtWebEngine/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtWebEngineWidgets/this_module_loads_test.py b/sources/pyside2/tests/QtWebEngineWidgets/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtWebEngineWidgets/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtWebKitWidgets/this_module_loads_test.py b/sources/pyside2/tests/QtWebKitWidgets/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtWebKitWidgets/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtWebSockets/CMakeLists.txt b/sources/pyside2/tests/QtWebSockets/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtWebSockets/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWebSockets/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtWebSockets/this_module_loads_test.py b/sources/pyside2/tests/QtWebSockets/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtWebSockets/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtWinExtras/CMakeLists.txt b/sources/pyside2/tests/QtWinExtras/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtWinExtras/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWinExtras/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtWinExtras/this_module_loads_test.py b/sources/pyside2/tests/QtWinExtras/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtWinExtras/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/QtX11Extras/CMakeLists.txt b/sources/pyside2/tests/QtX11Extras/CMakeLists.txt
index 79c5c83a9..2f7cb08b9 100644
--- a/sources/pyside2/tests/QtX11Extras/CMakeLists.txt
+++ b/sources/pyside2/tests/QtX11Extras/CMakeLists.txt
@@ -1 +1 @@
-PYSIDE_TEST(this_module_loads_test.py)
+# Please add some tests, here
diff --git a/sources/pyside2/tests/QtX11Extras/this_module_loads_test.py b/sources/pyside2/tests/QtX11Extras/this_module_loads_test.py
deleted file mode 100644
index 8645455d5..000000000
--- a/sources/pyside2/tests/QtX11Extras/this_module_loads_test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of PySide2.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from __future__ import print_function
-
-import os
-
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index bca2f5387..868a34409 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -140,3 +140,4 @@ PYSIDE_TEST(bug_1016.py)
 PYSIDE_TEST(utils_test.py)
 PYSIDE_TEST(mixin_signal_slots_test.py)
 PYSIDE_TEST(signal_slot_warning.py)
+PYSIDE_TEST(all_modules_load_test.py)
diff --git a/sources/pyside2/tests/QtConcurrent/this_module_loads_test.py b/sources/pyside2/tests/pysidetest/all_modules_load_test.py
index 8645455d5..7618d0bc3 100644
--- a/sources/pyside2/tests/QtConcurrent/this_module_loads_test.py
+++ b/sources/pyside2/tests/pysidetest/all_modules_load_test.py
@@ -26,14 +26,19 @@
 ##
 #############################################################################
 
-from __future__ import print_function
+import unittest
+import PySide2
 
-import os
+# Note:
+# "from PySide2 import *" can only be used at module level.
+# It is also really not recommended to use. But for testing,
+# the "__all__" variable is a great feature!
 
-modname = os.path.basename(os.path.dirname(__file__))
-try:
-    exec("from PySide2 import {}".format(modname))
-    print("The module {} loads. That is the minimum test, folks :-)".format(modname))
-except ImportError:
-    print("The module {} did not load! Did you include all classes in CMake?".format(modname))
-    raise
+class AllModulesImportTest(unittest.TestCase):
+    def testAllModulesCanImport(self):
+        # would also work: exec("from PySide2 import *")
+        for name in PySide2.__all__:
+            exec("import PySide2.{}".format(name))
+
+if __name__ == '__main__':
+    unittest.main()