diff options
author | Debao Zhang <dbzhang800@gmail.com> | 2012-03-20 20:21:30 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 13:22:10 +0100 |
commit | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (patch) | |
tree | ed358dc4de958dc7e52be1dc8282237c3f073969 /tests/auto/other | |
parent | f31e614245e796c7f82ec33eed708902d4d01521 (diff) |
Remove QWorkspace.
QWorkspace had been called Q3Workspace before Qt4.0 finally released.
In a sense, it is a Qt3 support Widget. And QWorkspace has been
deprecated and replaced by QMdiArea at Qt4.3.
Change-Id: Iea1bf831c9960c23c2b21d51fdc7c13b303642ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp | 4 | ||||
-rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 29 |
2 files changed, 2 insertions, 31 deletions
diff --git a/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index 14628b2c8b..126b41ed51 100644 --- a/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -449,7 +449,6 @@ void tst_ExceptionSafety_Objects::widgets_data() NEWROW(QToolButton); NEWROW(QTreeView); NEWROW(QTreeWidget); - NEWROW(QWorkspace); } void tst_ExceptionSafety_Objects::widgets() @@ -486,8 +485,7 @@ void tst_ExceptionSafety_Objects::widgets() || tag == QLatin1String("QToolBar") || tag == QLatin1String("QToolBox") || tag == QLatin1String("QTreeView") - || tag == QLatin1String("QTreeWidget") - || tag == QLatin1String("QWorkspace")) + || tag == QLatin1String("QTreeWidget")) QSKIP("This type of widget is not currently strongly exception safe"); if (tag == QLatin1String("QWidget")) diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index a72dac1b81..edd7a7aba4 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -252,7 +252,6 @@ private slots: void mdiAreaTest(); void mdiSubWindowTest(); void lineEditTest(); - void workspaceTest(); void dialogButtonBoxTest(); void dialTest(); void rubberBandTest(); @@ -587,7 +586,7 @@ static QWidget *createWidgets() /* Not in the list * QAbstractItemView, QGraphicsView, QScrollArea, * QToolButton, QDockWidget, QFocusFrame, QMainWindow, QMenu, QMenuBar, QSizeGrip, QSplashScreen, QSplitterHandle, - * QStatusBar, QSvgWidget, QTabBar, QToolBar, QWorkspace, QSplitter + * QStatusBar, QSvgWidget, QTabBar, QToolBar, QSplitter */ return w; } @@ -1818,32 +1817,6 @@ void tst_QAccessibility::lineEditTest() QTestAccessibility::clearEvents(); } -void tst_QAccessibility::workspaceTest() -{ - { - QWorkspace workspace; - workspace.resize(400,300); - workspace.show(); - const int subWindowCount = 3; - for (int i = 0; i < subWindowCount; ++i) { - QWidget *window = workspace.addWindow(new QWidget); - if (i > 0) - window->move(window->x() + 1, window->y()); - window->show(); - window->resize(70, window->height()); - } - - QWidgetList subWindows = workspace.windowList(); - QCOMPARE(subWindows.count(), subWindowCount); - - QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&workspace); - QVERIFY(interface); - QCOMPARE(interface->childCount(), subWindowCount); - - } - QTestAccessibility::clearEvents(); -} - bool accessibleInterfaceLeftOf(const QAccessibleInterface *a1, const QAccessibleInterface *a2) { return a1->rect().x() < a2->rect().x(); |