diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
commit | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (patch) | |
tree | 10733cb3fb35647b19cfd15ab158f56b1cb550e1 /tests/auto/widgets/widgets | |
parent | 21d607c81af0cd285e9bb3869ac3cd18358f1c8f (diff) | |
parent | a8321f21fb82714771b4717c99dd475f2c74649e (diff) |
Merge branch 'stable' into dev
Conflicts:
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
Diffstat (limited to 'tests/auto/widgets/widgets')
18 files changed, 0 insertions, 41 deletions
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp index 548d5b7c26..50d24a6b9f 100644 --- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp @@ -113,7 +113,6 @@ private: }; Q_DECLARE_METATYPE(QList<Qt::Key>) -Q_DECLARE_METATYPE(QPoint) void tst_QAbstractSlider::initTestCase() { diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 8ac3fea457..e9340eb6da 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -371,13 +371,10 @@ void tst_QComboBox::getSetCheck() typedef QList<QVariant> VariantList; typedef QList<QIcon> IconList; -Q_DECLARE_METATYPE(VariantList) -Q_DECLARE_METATYPE(IconList) Q_DECLARE_METATYPE(QComboBox::InsertPolicy) tst_QComboBox::tst_QComboBox() { - qRegisterMetaType<QModelIndex>("QModelIndex"); parent = 0; } @@ -1727,7 +1724,6 @@ void tst_QComboBox::findText() typedef QList<int> IntList; typedef QList<Qt::Key> KeyList; -Q_DECLARE_METATYPE(IntList) Q_DECLARE_METATYPE(KeyList) void tst_QComboBox::flaggedItems_data() diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index ad3d57f9c0..3d78fb96e2 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -53,8 +53,6 @@ #include <QGridLayout> #include <QPainter> -Q_DECLARE_METATYPE(QCommandLinkButton*) - class tst_QCommandLinkButton : public QObject { Q_OBJECT diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 79ef4f7441..269440e37e 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -93,13 +93,9 @@ #endif -Q_DECLARE_METATYPE(QDate); Q_DECLARE_METATYPE(Qt::Key); Q_DECLARE_METATYPE(Qt::KeyboardModifiers); Q_DECLARE_METATYPE(Qt::KeyboardModifier); -Q_DECLARE_METATYPE(QDateTime); -Q_DECLARE_METATYPE(QTime); -Q_DECLARE_METATYPE(QList<int>); #if defined(Q_OS_WINCE) #ifndef SPI_GETPLATFORMTYPE @@ -291,9 +287,6 @@ private: typedef QList<QTime> TimeList; typedef QList<Qt::Key> KeyList; -Q_DECLARE_METATYPE(TimeList) -Q_DECLARE_METATYPE(KeyList) - // Testing get/set functions void tst_QDateTimeEdit::getSetCheck() { @@ -323,9 +316,6 @@ void tst_QDateTimeEdit::getSetCheck() tst_QDateTimeEdit::tst_QDateTimeEdit() { - qRegisterMetaType<QDate>("QDate"); - qRegisterMetaType<QTime>("QTime"); - qRegisterMetaType<QDateTime>("QDateTime"); qRegisterMetaType<QList<int> >("QList<int>"); } @@ -3452,9 +3442,7 @@ void tst_QDateTimeEdit::deleteCalendarWidget() typedef QPair<Qt::Key, Qt::KeyboardModifier> KeyPair; typedef QList<KeyPair> KeyPairList; -Q_DECLARE_METATYPE(QLocale) Q_DECLARE_METATYPE(KeyPair) -Q_DECLARE_METATYPE(KeyPairList) static inline KeyPair key(Qt::Key key, Qt::KeyboardModifier modifier = Qt::NoModifier) { return KeyPair(key, modifier); diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index ef61cc8780..3f3d2cd65b 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -47,11 +47,9 @@ #include <qdialogbuttonbox.h> #include <limits.h> -Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QDialogButtonBox::ButtonRole) Q_DECLARE_METATYPE(QDialogButtonBox::StandardButton) Q_DECLARE_METATYPE(QDialogButtonBox::StandardButtons) -Q_DECLARE_METATYPE(QAbstractButton*) class tst_QDialogButtonBox : public QObject { diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 59f6ea46e9..2fbb6c031f 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -155,7 +155,6 @@ private: }; typedef QList<double> DoubleList; -Q_DECLARE_METATYPE(DoubleList) tst_QDoubleSpinBox::tst_QDoubleSpinBox() diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 133a8fa578..b180282a0f 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -318,7 +318,6 @@ private: }; typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) Q_DECLARE_METATYPE(QLineEdit::EchoMode) // Testing get/set functions diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 5f0a1e84b0..a98385fa2f 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -193,7 +193,6 @@ void tst_QMainWindow::getSetCheck() tst_QMainWindow::tst_QMainWindow() { - qRegisterMetaType<QSize>("QSize"); qRegisterMetaType<Qt::ToolButtonStyle>("Qt::ToolButtonStyle"); } diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index ba5c461223..e03d2de530 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -67,8 +67,6 @@ static const Qt::WindowFlags DefaultWindowFlags | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint; Q_DECLARE_METATYPE(QMdiArea::WindowOrder) -Q_DECLARE_METATYPE(QMdiSubWindow *) -Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QTabWidget::TabPosition) static bool tabBetweenSubWindowsIn(QMdiArea *mdiArea, int tabCount = -1, bool reverse = false) diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index 836333ceb1..8ffc22ed9a 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -65,9 +65,7 @@ //Used in copyAvailable typedef QPair<Qt::Key, Qt::KeyboardModifier> keyPairType; typedef QList<keyPairType> pairListType; -Q_DECLARE_METATYPE(pairListType); Q_DECLARE_METATYPE(keyPairType); -Q_DECLARE_METATYPE(QList<bool>); QT_FORWARD_DECLARE_CLASS(QPlainTextEdit) diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 9d16393861..372b883479 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -54,8 +54,6 @@ #include <QStyleFactory> #include <QTabWidget> -Q_DECLARE_METATYPE(QPushButton*) - class tst_QPushButton : public QObject { Q_OBJECT diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 6e1abb9fa9..1cdf552bb3 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -148,8 +148,6 @@ private: }; typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) -Q_DECLARE_METATYPE(QLocale) // Testing get/set functions void tst_QSpinBox::getSetCheck() diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index 7f2033f527..4bd4403bf9 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -168,7 +168,6 @@ void tst_QSplitter::cleanupTestCase() typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) void tst_QSplitter::setSizes() { diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index ed1f26734d..a52ef0e6a0 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -435,7 +435,6 @@ void tst_QTabBar::tabButton() typedef QList<int> IntList; Q_DECLARE_METATYPE(QTabBar::SelectionBehavior) -Q_DECLARE_METATYPE(IntList) #define ONE(x) (IntList() << x) void tst_QTabBar::selectionBehaviorOnRemove_data() { diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index 6fef2d4b9a..bc71407cea 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -249,7 +249,6 @@ void tst_QTextBrowser::viewportPositionInHistory() void tst_QTextBrowser::relativeLinks() { - qRegisterMetaType<QUrl>("QUrl"); QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(QUrl))); browser->setSource(QUrl("subdir/../qtextbrowser.html")); QVERIFY(!browser->document()->isEmpty()); diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index d7a95a8e63..0531126b5b 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -73,10 +73,7 @@ //Used in copyAvailable typedef QPair<Qt::Key, Qt::KeyboardModifier> keyPairType; typedef QList<keyPairType> pairListType; -Q_DECLARE_METATYPE(pairListType); Q_DECLARE_METATYPE(keyPairType); -Q_DECLARE_METATYPE(QList<bool>); -Q_DECLARE_METATYPE(QList<int>); QT_FORWARD_DECLARE_CLASS(QTextEdit) diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp index 3ad9994336..4b08824cf0 100644 --- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp @@ -99,7 +99,6 @@ QAction *triggered = 0; tst_QToolBar::tst_QToolBar() { - qRegisterMetaType<QSize>("QSize"); qRegisterMetaType<Qt::Orientation>("Qt::Orientation"); qRegisterMetaType<Qt::ToolBarAreas>("Qt::ToolBarAreas"); qRegisterMetaType<Qt::ToolButtonStyle>("Qt::ToolButtonStyle"); diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp index ce4791808b..a52e6788b9 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp @@ -117,8 +117,6 @@ void tst_QToolButton::getSetCheck() delete var4; } -Q_DECLARE_METATYPE(QAction*) - void tst_QToolButton::triggered() { qRegisterMetaType<QAction *>("QAction *"); |