diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2013-01-07 16:57:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-07 18:07:29 +0100 |
| commit | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (patch) | |
| tree | fbf5ef281002a47659d80405ae38f48b57e19c22 /tests/benchmarks/gui/image | |
| parent | 998899cf3a2501d3bf30ad06ce47a2cf81e1d60b (diff) | |
| parent | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/benchmarks/gui/image')
| -rw-r--r-- | tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp index fe63285352..34c9aac214 100644 --- a/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp +++ b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp @@ -42,7 +42,6 @@ #include <qtest.h> #include <QImage> -Q_DECLARE_METATYPE(QImage) class tst_QImageConversion : public QObject { diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp index ea883cc50b..f3368d9289 100644 --- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp @@ -54,13 +54,8 @@ 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 *) class tst_QImageReader : public QObject { |