diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-08-17 10:36:42 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-17 11:56:56 +0200 |
| commit | 7c5a4838133e0d5a748d8e6f7d6a6a3bc98c7687 (patch) | |
| tree | 9130ba17035fb0945974ba59badae6f3647d4da7 /tests | |
| parent | e44e36fade228c4945ead5deea7a98e4866925a3 (diff) | |
Gallery is a QtAddOn module.
Change-Id: If01febc4a69aed060cd8caf6ccb80171d92fb9b0
Reviewed-on: http://codereview.qt.nokia.com/3071
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Diffstat (limited to 'tests')
9 files changed, 27 insertions, 6 deletions
diff --git a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp index 0a98e04..35de338 100644 --- a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp +++ b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp @@ -45,7 +45,9 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE(QGalleryProperty::Attributes) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes)) + +QT_ADDON_USE_GALLERY_NAMESPACE class tst_QDocumentGallery : public QObject { diff --git a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp index 5f2b51c..b1b2dd9 100644 --- a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp +++ b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp @@ -48,6 +48,8 @@ #include <QtTest/QtTest> +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryAbstractRequest::State) class tst_QGalleryAbstractRequest : public QObject diff --git a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp index 77f673c..84527fe 100644 --- a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp +++ b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp @@ -45,6 +45,8 @@ #include <QtTest/QtTest> +QT_ADDON_USE_GALLERY_NAMESPACE + class tst_QGalleryAbstractResponse : public QObject { Q_OBJECT diff --git a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp index c192e1c..41b68b3 100644 --- a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp +++ b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp @@ -47,10 +47,12 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE(QVariant) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryFilter)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryFilter::Comparator)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryMetaDataFilter)) +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QVariant)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryFilter)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryFilter::Comparator)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryMetaDataFilter)) + +QT_ADDON_USE_GALLERY_NAMESPACE class tst_QGalleryFilter : public QObject { diff --git a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp index 761cbb8..7929c9d 100644 --- a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp +++ b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp @@ -52,6 +52,9 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QList<int>) + +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryResultSet*) class tst_QGalleryItemRequest : public QObject diff --git a/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp b/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp index 13b5dda..9808ed8 100644 --- a/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp +++ b/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp @@ -52,6 +52,9 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QModelIndex) + +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryAbstractRequest::State) class QtTestGallery; diff --git a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp index 34acd36..84857d6 100644 --- a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp +++ b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp @@ -51,6 +51,8 @@ #include <QtTest/QtTest> +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryResultSet*) class tst_QGalleryQueryRequest : public QObject diff --git a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp index 8b71499..b7bd940 100644 --- a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp +++ b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp @@ -45,7 +45,9 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryResource)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryResource)) + +QT_ADDON_USE_GALLERY_NAMESPACE class tst_QGalleryResource : public QObject { diff --git a/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp b/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp index 4493e5e..565b00c 100644 --- a/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp +++ b/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp @@ -52,6 +52,9 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QList<int>) + +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryResultSet*) class tst_QGalleryTypeRequest : public QObject |