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/qdatetimeedit/tst_qdatetimeedit.cpp | |
| 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/qdatetimeedit/tst_qdatetimeedit.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
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); |