diff options
author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
---|---|---|
committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
commit | fb3e9bc2d941462f1244aaf0ea79425a307f883d (patch) | |
tree | afce91959098ec887ce466abc6e40342261df3db /src/gallery | |
parent | c61d909c7b815319e40ba27d7f84e92aa5f1f946 (diff) | |
parent | 6f0dc7cc40dd63763a581a7fb6d4e76649b8026c (diff) |
Merge branch 'master' into 1.2.0v1.2.0
Diffstat (limited to 'src/gallery')
-rw-r--r-- | src/gallery/qabstractgallery.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qdocumentgallery.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryabstractrequest.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryabstractresponse.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryfilter.cpp | 3 | ||||
-rw-r--r-- | src/gallery/qgalleryitemrequest.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryquerymodel.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryqueryrequest.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryresource.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgalleryresultset.cpp | 1 | ||||
-rw-r--r-- | src/gallery/qgallerytyperequest.cpp | 1 |
11 files changed, 13 insertions, 0 deletions
diff --git a/src/gallery/qabstractgallery.cpp b/src/gallery/qabstractgallery.cpp index 1e5dd6c0c4..2113cfe1fa 100644 --- a/src/gallery/qabstractgallery.cpp +++ b/src/gallery/qabstractgallery.cpp @@ -49,6 +49,7 @@ QTM_BEGIN_NAMESPACE \ingroup gallery \ingroup gallery-galleries + \since 1.1 \inmodule QtGallery diff --git a/src/gallery/qdocumentgallery.cpp b/src/gallery/qdocumentgallery.cpp index 7ee956ea37..cb426a102e 100644 --- a/src/gallery/qdocumentgallery.cpp +++ b/src/gallery/qdocumentgallery.cpp @@ -51,6 +51,7 @@ QTM_BEGIN_NAMESPACE \ingroup gallery \ingroup gallery-galleries + \since 1.1 \inmodule QtGallery diff --git a/src/gallery/qgalleryabstractrequest.cpp b/src/gallery/qgalleryabstractrequest.cpp index 56388720b7..9aa15a6cbc 100644 --- a/src/gallery/qgalleryabstractrequest.cpp +++ b/src/gallery/qgalleryabstractrequest.cpp @@ -122,6 +122,7 @@ void QGalleryAbstractRequestPrivate::_q_progressChanged(int current, int maximum \ingroup gallery \ingroup gallery-requests + \since 1.1 \inmodule QtGallery diff --git a/src/gallery/qgalleryabstractresponse.cpp b/src/gallery/qgalleryabstractresponse.cpp index 66af6180a2..af75aef871 100644 --- a/src/gallery/qgalleryabstractresponse.cpp +++ b/src/gallery/qgalleryabstractresponse.cpp @@ -52,6 +52,7 @@ QTM_BEGIN_NAMESPACE \ingroup gallery \inmodule QtGallery + \since 1.1 \brief The QGalleryAbstractResponse class provides a base class for responses to gallery requests. diff --git a/src/gallery/qgalleryfilter.cpp b/src/gallery/qgalleryfilter.cpp index 1bfd238dff..cc5d1fcb64 100644 --- a/src/gallery/qgalleryfilter.cpp +++ b/src/gallery/qgalleryfilter.cpp @@ -219,6 +219,7 @@ public: \ingroup gallery \ingroup gallery-filters + \since 1.1 \inmodule QtGallery @@ -510,6 +511,7 @@ QGalleryIntersectionFilter operator &&( \ingroup gallery \ingroup gallery-filters + \since 1.1 \inmodule QtGallery @@ -795,6 +797,7 @@ QGalleryUnionFilter operator ||( \ingroup gallery-filters \inmodule QtGallery + \since 1.1 \brief The QGalleryMetaDataFilter class provides a filter which accepts items with meta-data properties matching a specific value. diff --git a/src/gallery/qgalleryitemrequest.cpp b/src/gallery/qgalleryitemrequest.cpp index 1dad0135c3..9dc48212b1 100644 --- a/src/gallery/qgalleryitemrequest.cpp +++ b/src/gallery/qgalleryitemrequest.cpp @@ -108,6 +108,7 @@ public: \ingroup gallery-requests \inmodule QtGallery + \since 1.1 \brief The QGalleryItemRequest class provides a request for the properties of a single item from a gallery. diff --git a/src/gallery/qgalleryquerymodel.cpp b/src/gallery/qgalleryquerymodel.cpp index 93a4d2d244..5dd0788428 100644 --- a/src/gallery/qgalleryquerymodel.cpp +++ b/src/gallery/qgalleryquerymodel.cpp @@ -281,6 +281,7 @@ void QGalleryQueryModelPrivate::_q_metaDataChanged(int index, int count, const Q \ingroup gallery \inmodule QtGallery + \since 1.1 \brief The QGalleryQueryModel class provides a model for the results of a gallery query. diff --git a/src/gallery/qgalleryqueryrequest.cpp b/src/gallery/qgalleryqueryrequest.cpp index 9e0535332f..c4701a3376 100644 --- a/src/gallery/qgalleryqueryrequest.cpp +++ b/src/gallery/qgalleryqueryrequest.cpp @@ -83,6 +83,7 @@ public: \ingroup gallery-requests \inmodule QtGallery + \since 1.1 \brief The QGalleryQueryRequest class provides a request for a set of items from a gallery. diff --git a/src/gallery/qgalleryresource.cpp b/src/gallery/qgalleryresource.cpp index 642a027c4a..a0874553d9 100644 --- a/src/gallery/qgalleryresource.cpp +++ b/src/gallery/qgalleryresource.cpp @@ -47,6 +47,7 @@ QTM_BEGIN_NAMESPACE \class QGalleryResource \ingroup gallery + \since 1.1 \inmodule QtGallery diff --git a/src/gallery/qgalleryresultset.cpp b/src/gallery/qgalleryresultset.cpp index 2e9e9550d5..7fe5fd01ce 100644 --- a/src/gallery/qgalleryresultset.cpp +++ b/src/gallery/qgalleryresultset.cpp @@ -49,6 +49,7 @@ QTM_BEGIN_NAMESPACE \class QGalleryResultSet \ingroup gallery + \since 1.1 \inmodule QtGallery diff --git a/src/gallery/qgallerytyperequest.cpp b/src/gallery/qgallerytyperequest.cpp index 2138620f5d..3f869628cf 100644 --- a/src/gallery/qgallerytyperequest.cpp +++ b/src/gallery/qgallerytyperequest.cpp @@ -108,6 +108,7 @@ public: \ingroup gallery-requests \inmodule QtGallery + \since 1.1 \brief The QGalleryTypeRequest class provides an interface for requesting the properties of a type from a gallery. |