From 73d2970acda9dc3db16128b19a7c84f871b2f749 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 12 Oct 2011 11:35:52 +1000 Subject: [PATCH] Remove Mac accessibility autotest. This test was empty, the logic having been recently removed because it only applied to the Carbon UI, which will not be supported by Qt5. Change-Id: I2b5d6aba6be4a51eadbac3ca9d19d1a68c4fc1ab Reviewed-by: Rohan McGovern --- tests/auto/other.pro | 2 - tests/auto/qaccessibility_mac/.gitignore | 1 - tests/auto/qaccessibility_mac/buttons.ui | 83 ------------- tests/auto/qaccessibility_mac/combobox.ui | 50 -------- tests/auto/qaccessibility_mac/form.ui | 22 ---- tests/auto/qaccessibility_mac/groups.ui | 100 --------------- tests/auto/qaccessibility_mac/label.ui | 35 ------ tests/auto/qaccessibility_mac/lineedit.ui | 35 ------ tests/auto/qaccessibility_mac/listview.ui | 89 -------------- .../qaccessibility_mac/qaccessibility_mac.pro | 23 ---- .../qaccessibility_mac/qaccessibility_mac.qrc | 15 --- tests/auto/qaccessibility_mac/radiobutton.ui | 38 ------ tests/auto/qaccessibility_mac/scrollbar.ui | 38 ------ tests/auto/qaccessibility_mac/splitters.ui | 52 -------- tests/auto/qaccessibility_mac/tableview.ui | 114 ------------------ tests/auto/qaccessibility_mac/tabs.ui | 68 ----------- tests/auto/qaccessibility_mac/textBrowser.ui | 40 ------ .../tst_qaccessibility_mac.cpp | 47 -------- 18 files changed, 852 deletions(-) delete mode 100644 tests/auto/qaccessibility_mac/.gitignore delete mode 100644 tests/auto/qaccessibility_mac/buttons.ui delete mode 100644 tests/auto/qaccessibility_mac/combobox.ui delete mode 100644 tests/auto/qaccessibility_mac/form.ui delete mode 100644 tests/auto/qaccessibility_mac/groups.ui delete mode 100644 tests/auto/qaccessibility_mac/label.ui delete mode 100644 tests/auto/qaccessibility_mac/lineedit.ui delete mode 100644 tests/auto/qaccessibility_mac/listview.ui delete mode 100644 tests/auto/qaccessibility_mac/qaccessibility_mac.pro delete mode 100644 tests/auto/qaccessibility_mac/qaccessibility_mac.qrc delete mode 100644 tests/auto/qaccessibility_mac/radiobutton.ui delete mode 100644 tests/auto/qaccessibility_mac/scrollbar.ui delete mode 100644 tests/auto/qaccessibility_mac/splitters.ui delete mode 100644 tests/auto/qaccessibility_mac/tableview.ui delete mode 100644 tests/auto/qaccessibility_mac/tabs.ui delete mode 100644 tests/auto/qaccessibility_mac/textBrowser.ui delete mode 100644 tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 913ed31b9a..48170a26f2 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -11,7 +11,6 @@ SUBDIRS=\ macnativeevents \ macplist \ qaccessibility \ - qaccessibility_mac \ qcombobox \ qcopchannel \ qdirectpainter \ @@ -37,7 +36,6 @@ wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility macgui \ macnativeevents \ macplist \ - qaccessibility_mac \ !embedded|wince*: SUBDIRS -= \ qcopchannel \ diff --git a/tests/auto/qaccessibility_mac/.gitignore b/tests/auto/qaccessibility_mac/.gitignore deleted file mode 100644 index 54daa4f055..0000000000 --- a/tests/auto/qaccessibility_mac/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qaccessibility_mac diff --git a/tests/auto/qaccessibility_mac/buttons.ui b/tests/auto/qaccessibility_mac/buttons.ui deleted file mode 100644 index d2857c4818..0000000000 --- a/tests/auto/qaccessibility_mac/buttons.ui +++ /dev/null @@ -1,83 +0,0 @@ - - - - - Form - - - - 0 - 0 - 320 - 277 - - - - Form - - - - - 30 - 40 - 109 - 32 - - - - Ren - - - - - - 180 - 110 - 71 - 41 - - - - Brain - - - - - - 180 - 50 - 104 - 20 - - - - Stimpy - - - true - - - - - false - - - - 40 - 120 - 90 - 20 - - - - Pinky - - - false - - - - - - - diff --git a/tests/auto/qaccessibility_mac/combobox.ui b/tests/auto/qaccessibility_mac/combobox.ui deleted file mode 100644 index abe3f07710..0000000000 --- a/tests/auto/qaccessibility_mac/combobox.ui +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - 30 - 30 - 171 - 26 - - - - 0 - - - - Foo - - - - - Bar - - - - - Baz - - - - - - - - diff --git a/tests/auto/qaccessibility_mac/form.ui b/tests/auto/qaccessibility_mac/form.ui deleted file mode 100644 index 0ef5560efc..0000000000 --- a/tests/auto/qaccessibility_mac/form.ui +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Form - - - - 0 - 0 - 481 - 402 - - - - Form - - - - - - diff --git a/tests/auto/qaccessibility_mac/groups.ui b/tests/auto/qaccessibility_mac/groups.ui deleted file mode 100644 index 0bf6b13db5..0000000000 --- a/tests/auto/qaccessibility_mac/groups.ui +++ /dev/null @@ -1,100 +0,0 @@ - - - - - Form - - - - 0 - 0 - 529 - 408 - - - - Form - - - - - 60 - 30 - 181 - 161 - - - - Group A - - - - - 0 - 30 - 171 - 32 - - - - PushButton 1 - - - - - - 20 - 80 - 131 - 32 - - - - PushButton 2 - - - - - - - 300 - 30 - 181 - 161 - - - - Group B - - - - - 10 - 30 - 171 - 32 - - - - PushButton 3 - - - - - - 20 - 80 - 131 - 32 - - - - PushButton 4 - - - - - - - - diff --git a/tests/auto/qaccessibility_mac/label.ui b/tests/auto/qaccessibility_mac/label.ui deleted file mode 100644 index 8d86b42827..0000000000 --- a/tests/auto/qaccessibility_mac/label.ui +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - 80 - 50 - 231 - 16 - - - - This is a Text Label - - - - - - - diff --git a/tests/auto/qaccessibility_mac/lineedit.ui b/tests/auto/qaccessibility_mac/lineedit.ui deleted file mode 100644 index 479f7d3de0..0000000000 --- a/tests/auto/qaccessibility_mac/lineedit.ui +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - 70 - 70 - 113 - 20 - - - - Line edit - - - - - - - diff --git a/tests/auto/qaccessibility_mac/listview.ui b/tests/auto/qaccessibility_mac/listview.ui deleted file mode 100644 index f7d570e4b6..0000000000 --- a/tests/auto/qaccessibility_mac/listview.ui +++ /dev/null @@ -1,89 +0,0 @@ - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - Item 1 - - - - - Item 2 - - - - - Item 3 - - - - - Item 4 - - - - - New Item - - - - - New Item - - - - - New Item - - - - - New Item - - - - - New Item - - - - - New Item - - - - - New Item - - - - - New Item - - - - - New Item - - - - - - - - - diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro deleted file mode 100644 index 21b6225865..0000000000 --- a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG += qttest_p4 -SOURCES += tst_qaccessibility_mac.cpp -TARGET = tst_qaccessibility_mac - -RESOURCES = qaccessibility_mac.qrc - -requires(mac) - -# this setup should support both building as an autotest -# (where uilib isn't built by default), and when running shadow -# builds (where QTDIR points to the build directory). -# autotest + shadow build is not supported :) -exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) { - include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri, "", true) - INCLUDEPATH += $$(QTDIR)/tools/designer/src/uitools - SOURCES += $$(QTDIR)/tools/designer/src/uitools/quiloader.cpp - HEADERS += $$(QTDIR)/tools/designer/src/uitools/quiloader.h -} else { - CONFIG += uitools -} -QT += xml widgets -LIBS += -framework ApplicationServices -framework Carbon - diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.qrc b/tests/auto/qaccessibility_mac/qaccessibility_mac.qrc deleted file mode 100644 index 511a4fb075..0000000000 --- a/tests/auto/qaccessibility_mac/qaccessibility_mac.qrc +++ /dev/null @@ -1,15 +0,0 @@ - - - buttons.ui - form.ui - label.ui - radiobutton.ui - splitters.ui - combobox.ui - groups.ui - lineedit.ui - scrollbar.ui - tabs.ui - - - diff --git a/tests/auto/qaccessibility_mac/radiobutton.ui b/tests/auto/qaccessibility_mac/radiobutton.ui deleted file mode 100644 index d09b3c8f86..0000000000 --- a/tests/auto/qaccessibility_mac/radiobutton.ui +++ /dev/null @@ -1,38 +0,0 @@ - - - - - Form - - - - 0 - 0 - 426 - 327 - - - - Form - - - - - 60 - 40 - 221 - 20 - - - - A checked radio button - - - true - - - - - - - diff --git a/tests/auto/qaccessibility_mac/scrollbar.ui b/tests/auto/qaccessibility_mac/scrollbar.ui deleted file mode 100644 index 2d12cf62ec..0000000000 --- a/tests/auto/qaccessibility_mac/scrollbar.ui +++ /dev/null @@ -1,38 +0,0 @@ - - - - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - 20 - 20 - 16 - 300 - - - - 50 - - - Qt::Vertical - - - - - - - diff --git a/tests/auto/qaccessibility_mac/splitters.ui b/tests/auto/qaccessibility_mac/splitters.ui deleted file mode 100644 index 8b341e4009..0000000000 --- a/tests/auto/qaccessibility_mac/splitters.ui +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - 0 - 0 - 400 - 300 - - - - Form - - - - 9 - - - 6 - - - - - Qt::Horizontal - - - - Foo - - - - - Bar - - - - - Baz - - - - - - - - - - diff --git a/tests/auto/qaccessibility_mac/tableview.ui b/tests/auto/qaccessibility_mac/tableview.ui deleted file mode 100644 index 6f17f3e342..0000000000 --- a/tests/auto/qaccessibility_mac/tableview.ui +++ /dev/null @@ -1,114 +0,0 @@ - - Form - - - - 0 - 0 - 436 - 419 - - - - Form - - - - - - - Row 1 - - - - - row 2 - - - - - row 3 - - - - - row 4 - - - - - New Row - - - - - New Row - - - - - New Row - - - - - New Row - - - - - New Row - - - - - New Row - - - - - New Row - - - - - New Row - - - - - Col A - - - - - Col B - - - - - Cell 1A - - - - - Cell 1B - - - - - Cell 2A - - - - - Cell 2B - - - - - - - - - diff --git a/tests/auto/qaccessibility_mac/tabs.ui b/tests/auto/qaccessibility_mac/tabs.ui deleted file mode 100644 index 2d42f13a6e..0000000000 --- a/tests/auto/qaccessibility_mac/tabs.ui +++ /dev/null @@ -1,68 +0,0 @@ - - - - - Form - - - - 0 - 0 - 643 - 496 - - - - Form - - - - - 80 - 30 - 221 - 191 - - - - - Tab 1 - - - - - 30 - 50 - 109 - 32 - - - - PushButton one - - - - - - Tab 2 - - - - - 50 - 20 - 109 - 32 - - - - PushButton two - - - - - - - - - diff --git a/tests/auto/qaccessibility_mac/textBrowser.ui b/tests/auto/qaccessibility_mac/textBrowser.ui deleted file mode 100644 index 41f4450d89..0000000000 --- a/tests/auto/qaccessibility_mac/textBrowser.ui +++ /dev/null @@ -1,40 +0,0 @@ - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - 10 - 20 - 311 - 251 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Line one</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Line two</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Line three</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Line four</p></body></html> - - - - - - diff --git a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp deleted file mode 100644 index c3a0e32369..0000000000 --- a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include - -QTEST_NOOP_MAIN - -#include "tst_qaccessibility_mac.moc" - -