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

Change-Id: I777970f7bb17db766660d82556559eadd7293355

2 files changed, 64 insertions, 0 deletions

diff --git a/sources/pyside2/tests/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt
index 60a1d7d6f..af3a476b1 100644
--- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt
@@ -117,6 +117,7 @@ PYSIDE_TEST(qstring_qkeysequence_test.py)
 PYSIDE_TEST(qstyle_test.py)
 PYSIDE_TEST(qtableview_test.py)
 PYSIDE_TEST(qtabwidget_test.py)
+PYSIDE_TEST(qtabwidgetclear_test.py)
 PYSIDE_TEST(qtextedit_test.py)
 PYSIDE_TEST(qtextedit_signal_test.py)
 PYSIDE_TEST(qtoolbar_test.py)
diff --git a/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
new file mode 100644
index 000000000..8e9b36fab
--- /dev/null
+++ b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
@@ -0,0 +1,63 @@
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
+
+import unittest
+
+from PySide2.QtWidgets import QMainWindow, QTabWidget, QTextEdit, QSplitter
+from helper import UsesQApplication
+
+class TabWidgetClear(QMainWindow):
+    def __init__(self):
+        QMainWindow.__init__(self)
+        self.tabWidget = QTabWidget(self)
+        self.setCentralWidget(self.tabWidget)
+        self.editBox = QTextEdit(self)
+        self.tabWidget.addTab(self.getSplitter(), 'Test')
+
+    def getSplitter(self):
+        splitter = QSplitter()
+        splitter.addWidget(self.editBox)
+        return splitter
+
+    def toggle(self):
+        self.tabWidget.clear()
+        self.getSplitter()
+
+class TestTabWidgetClear(UsesQApplication):
+
+    def testClear(self):
+        self.window = TabWidgetClear()
+        self.window.show()
+        try:
+            self.window.toggle()
+        except RuntimeError as e:
+            # This should never happened, PYSIDE-213
+            raise e
+
+if __name__ == '__main__':
+    unittest.main()