diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-01-03 10:30:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-04 18:39:08 +0100 |
| commit | cc69dff01ba8817fd12155cbb26e0cf27faae3e8 (patch) | |
| tree | db930b4e7f610e22c76f7424004198d327a8e65e /tests/auto/gui/image | |
| parent | 79f1afc23caf4c6c8bbf4141ba023208c10bb557 (diff) | |
Gui: Remove declaration of built-in and automatic metatypes.
These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.
Change-Id: I95b8b4b674e85b2b3c374931f6231d60f35be984
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests/auto/gui/image')
4 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index acbb50d8f3..148bec705e 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -45,7 +45,6 @@ #include <qicon.h> #include <qiconengine.h> -Q_DECLARE_METATYPE(QSize) class tst_QIcon : public QObject { diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 57aaeb965e..10d850ccb8 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -57,13 +57,6 @@ typedef QMap<QString, QString> QStringMap; typedef QList<int> QIntList; -Q_DECLARE_METATYPE(QImage) -Q_DECLARE_METATYPE(QRect) -Q_DECLARE_METATYPE(QSize) -Q_DECLARE_METATYPE(QColor) -Q_DECLARE_METATYPE(QStringMap) -Q_DECLARE_METATYPE(QIntList) -Q_DECLARE_METATYPE(QIODevice *) Q_DECLARE_METATYPE(QImage::Format) class tst_QImageReader : public QObject diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index 6ec4918b73..76b1542576 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -58,11 +58,7 @@ typedef QMap<QString, QString> QStringMap; typedef QList<int> QIntList; -Q_DECLARE_METATYPE(QImage) -Q_DECLARE_METATYPE(QStringMap) -Q_DECLARE_METATYPE(QIntList) Q_DECLARE_METATYPE(QImageWriter::ImageWriterError) -Q_DECLARE_METATYPE(QIODevice *) Q_DECLARE_METATYPE(QImage::Format) class tst_QImageWriter : public QObject diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 6a7ce66bd7..576519e2ca 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -200,10 +200,6 @@ static bool lenientCompare(const QPixmap &actual, const QPixmap &expected) return true; } -Q_DECLARE_METATYPE(QImage) -Q_DECLARE_METATYPE(QPixmap) -Q_DECLARE_METATYPE(QMatrix) -Q_DECLARE_METATYPE(QBitmap) tst_QPixmap::tst_QPixmap() { |