diff options
author | Christian Stenger <christian.stenger@qt.io> | 2019-09-11 13:54:24 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2019-09-11 12:49:36 +0000 |
commit | 38a78711226bb65286ed568b0c64f9ee367142f2 (patch) | |
tree | 9401df9897afbfa0e65f39f5ae81bd15ace93bd6 | |
parent | e36e6f0abd45c2794c70c31eb10c5263e7e7a29a (diff) |
Fix building with namespaced Qt
Change-Id: Iefe4ae55a7543d24baae7d8d5286c76ffece06f8
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | src/gallery/qabstractgallery.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qdocumentgallery.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgalleryabstractrequest.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgalleryabstractresponse.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgalleryitemrequest.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgalleryquerymodel.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgalleryqueryrequest.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgalleryresultset.cpp | 4 | ||||
-rw-r--r-- | src/gallery/qgallerytyperequest.cpp | 4 | ||||
-rw-r--r-- | src/imports/gallery/qdeclarativedocumentgallery.cpp | 4 | ||||
-rw-r--r-- | src/imports/gallery/qdeclarativegallery.cpp | 4 | ||||
-rw-r--r-- | src/imports/gallery/qdeclarativegalleryfilter.cpp | 4 | ||||
-rw-r--r-- | src/imports/gallery/qdeclarativegalleryitem.cpp | 4 | ||||
-rw-r--r-- | src/imports/gallery/qdeclarativegalleryquerymodel.cpp | 4 | ||||
-rw-r--r-- | src/imports/gallery/qdeclarativegallerytype.cpp | 4 |
15 files changed, 30 insertions, 30 deletions
diff --git a/src/gallery/qabstractgallery.cpp b/src/gallery/qabstractgallery.cpp index 83a8504..01bd32d 100644 --- a/src/gallery/qabstractgallery.cpp +++ b/src/gallery/qabstractgallery.cpp @@ -122,6 +122,6 @@ QAbstractGallery::~QAbstractGallery() Creates a response to a gallery \a request. */ -#include "moc_qabstractgallery.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qabstractgallery.cpp" diff --git a/src/gallery/qdocumentgallery.cpp b/src/gallery/qdocumentgallery.cpp index cf5f01d..2802394 100644 --- a/src/gallery/qdocumentgallery.cpp +++ b/src/gallery/qdocumentgallery.cpp @@ -1000,6 +1000,6 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque #endif // QT_DOCUMENT_GALLERY_NULL -#include "moc_qdocumentgallery.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qdocumentgallery.cpp" diff --git a/src/gallery/qgalleryabstractrequest.cpp b/src/gallery/qgalleryabstractrequest.cpp index a190257..260b155 100644 --- a/src/gallery/qgalleryabstractrequest.cpp +++ b/src/gallery/qgalleryabstractrequest.cpp @@ -577,6 +577,6 @@ void QGalleryAbstractRequest::clear() Sets the \a response to an executed request. */ -#include "moc_qgalleryabstractrequest.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgalleryabstractrequest.cpp" diff --git a/src/gallery/qgalleryabstractresponse.cpp b/src/gallery/qgalleryabstractresponse.cpp index a40d7e9..2f599b7 100644 --- a/src/gallery/qgalleryabstractresponse.cpp +++ b/src/gallery/qgalleryabstractresponse.cpp @@ -328,6 +328,6 @@ void QGalleryAbstractResponse::error(int error, const QString &errorString) Signals that a response was canceled. */ -#include "moc_qgalleryabstractresponse.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgalleryabstractresponse.cpp" diff --git a/src/gallery/qgalleryitemrequest.cpp b/src/gallery/qgalleryitemrequest.cpp index a9a0874..3f0bd4c 100644 --- a/src/gallery/qgalleryitemrequest.cpp +++ b/src/gallery/qgalleryitemrequest.cpp @@ -428,6 +428,6 @@ void QGalleryItemRequest::setResponse(QGalleryAbstractResponse *response) emit itemChanged(); } -#include "moc_qgalleryitemrequest.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgalleryitemrequest.cpp" diff --git a/src/gallery/qgalleryquerymodel.cpp b/src/gallery/qgalleryquerymodel.cpp index ca839ed..25d903a 100644 --- a/src/gallery/qgalleryquerymodel.cpp +++ b/src/gallery/qgalleryquerymodel.cpp @@ -978,6 +978,6 @@ Qt::ItemFlags QGalleryQueryModel::flags(const QModelIndex &index) const return d_ptr->itemFlags.value(index.column()) ; } -#include "moc_qgalleryquerymodel.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgalleryquerymodel.cpp" diff --git a/src/gallery/qgalleryqueryrequest.cpp b/src/gallery/qgalleryqueryrequest.cpp index ed52131..9e0fe45 100644 --- a/src/gallery/qgalleryqueryrequest.cpp +++ b/src/gallery/qgalleryqueryrequest.cpp @@ -689,6 +689,6 @@ void QGalleryQueryRequest::setResponse(QGalleryAbstractResponse *response) emit resultSetChanged(d->resultSet); } -#include "moc_qgalleryqueryrequest.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgalleryqueryrequest.cpp" diff --git a/src/gallery/qgalleryresultset.cpp b/src/gallery/qgalleryresultset.cpp index fc56391..88fc33d 100644 --- a/src/gallery/qgalleryresultset.cpp +++ b/src/gallery/qgalleryresultset.cpp @@ -322,6 +322,6 @@ bool QGalleryResultSet::fetchLast() at \a index has changed. */ -#include "moc_qgalleryresultset.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgalleryresultset.cpp" diff --git a/src/gallery/qgallerytyperequest.cpp b/src/gallery/qgallerytyperequest.cpp index 2cdf13a..34b23a0 100644 --- a/src/gallery/qgallerytyperequest.cpp +++ b/src/gallery/qgallerytyperequest.cpp @@ -375,6 +375,6 @@ void QGalleryTypeRequest::setResponse(QGalleryAbstractResponse *response) emit typeChanged(); } -#include "moc_qgallerytyperequest.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qgallerytyperequest.cpp" diff --git a/src/imports/gallery/qdeclarativedocumentgallery.cpp b/src/imports/gallery/qdeclarativedocumentgallery.cpp index c2a35b4..e1e58e5 100644 --- a/src/imports/gallery/qdeclarativedocumentgallery.cpp +++ b/src/imports/gallery/qdeclarativedocumentgallery.cpp @@ -83,6 +83,6 @@ QAbstractGallery *QDeclarativeDocumentGallery::gallery(QObject *object) return qt_declarativeDocumentGalleryInstance(); } -#include "moc_qdeclarativedocumentgallery.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qdeclarativedocumentgallery.cpp" diff --git a/src/imports/gallery/qdeclarativegallery.cpp b/src/imports/gallery/qdeclarativegallery.cpp index 299bad0..8b7a0b8 100644 --- a/src/imports/gallery/qdeclarativegallery.cpp +++ b/src/imports/gallery/qdeclarativegallery.cpp @@ -85,6 +85,6 @@ public: } }; -#include "qdeclarativegallery.moc" - QT_END_NAMESPACE_DOCGALLERY + +#include "qdeclarativegallery.moc" diff --git a/src/imports/gallery/qdeclarativegalleryfilter.cpp b/src/imports/gallery/qdeclarativegalleryfilter.cpp index 9cbefde..e14768c 100644 --- a/src/imports/gallery/qdeclarativegalleryfilter.cpp +++ b/src/imports/gallery/qdeclarativegalleryfilter.cpp @@ -622,6 +622,6 @@ QGalleryFilter QDeclarativeGalleryFilterIntersection::filter() const return intersectionFilter; } -#include "moc_qdeclarativegalleryfilter.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qdeclarativegalleryfilter.cpp" diff --git a/src/imports/gallery/qdeclarativegalleryitem.cpp b/src/imports/gallery/qdeclarativegalleryitem.cpp index f78512c..74d5795 100644 --- a/src/imports/gallery/qdeclarativegalleryitem.cpp +++ b/src/imports/gallery/qdeclarativegalleryitem.cpp @@ -396,6 +396,6 @@ QDeclarativeDocumentGallery::ItemType QDeclarativeDocumentGalleryItem::itemType( Clears the results of a request. */ -#include "moc_qdeclarativegalleryitem.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qdeclarativegalleryitem.cpp" diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp index d4f3c99..0a1dfe6 100644 --- a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp +++ b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp @@ -760,6 +760,6 @@ QVariant QDeclarativeDocumentGalleryModel::itemType(const QString &type) const return QVariant::fromValue(QDeclarativeDocumentGallery::itemTypeFromString(type)); } -#include "moc_qdeclarativegalleryquerymodel.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qdeclarativegalleryquerymodel.cpp" diff --git a/src/imports/gallery/qdeclarativegallerytype.cpp b/src/imports/gallery/qdeclarativegallerytype.cpp index 6428a28..bd2905b 100644 --- a/src/imports/gallery/qdeclarativegallerytype.cpp +++ b/src/imports/gallery/qdeclarativegallerytype.cpp @@ -384,6 +384,6 @@ void QDeclarativeDocumentGalleryType::setItemType(QDeclarativeDocumentGallery::I Clears the results of a request. */ -#include "moc_qdeclarativegallerytype.cpp" - QT_END_NAMESPACE_DOCGALLERY + +#include "moc_qdeclarativegallerytype.cpp" |