diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-12-03 11:23:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 12:46:15 +0100 |
| commit | 0053e4d3ccdafa1ccf4bb4d0b240426440ea2d00 (patch) | |
| tree | ae60bdaf083b611a02887de2d2c9b5dc9c1c1764 | |
| parent | c3584c7e02791ecbff580083f782ae463437e397 (diff) | |
Expose properties common to multiple type through File.
Change-Id: I7f4c18fd72b4e04812519403dcb7618f9dd32960
Done-with: Andrew den Exter <andrew.den.exter@jollamobile.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/gallery/tracker/qgallerytrackerschema.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/gallery/tracker/qgallerytrackerschema.cpp b/src/gallery/tracker/qgallerytrackerschema.cpp index 5e9f3a3..25d008a 100644 --- a/src/gallery/tracker/qgallerytrackerschema.cpp +++ b/src/gallery/tracker/qgallerytrackerschema.cpp @@ -706,8 +706,7 @@ static const QGalleryItemProperty qt_galleryOrientationPropertyList[] = { #define QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES \ QT_GALLERY_COMPOSITE_PROPERTY_NO_DEPENDENCIES("fileExtension", String, QGalleryTrackerFileExtensionColumn::create, qt_writeFileExtensionCondition), \ QT_GALLERY_COMPOSITE_PROPERTY_NO_DEPENDENCIES("filePath" , String, QGalleryTrackerFilePathColumn::create , qt_writeFilePathCondition), \ - QT_GALLERY_COMPOSITE_PROPERTY_NO_DEPENDENCIES("path" , String, QGalleryTrackerPathColumn::create , qt_writePathCondition), \ - QT_GALLERY_COMPOSITE_PROPERTY("orientation", Int, qt_galleryOrientationPropertyList, QGalleryTrackerOrientationColumn::create, qt_writeOrientationCondition) + QT_GALLERY_COMPOSITE_PROPERTY_NO_DEPENDENCIES("path" , String, QGalleryTrackerPathColumn::create , qt_writePathCondition) //nfo:Media : nfo:FileDataObject // nfo:equipment, nfo:genre, nfo:averageBitrate, nfo:bitrateType, nfo:encodedBy, nfo:codec, @@ -731,6 +730,8 @@ static const QGalleryItemProperty qt_galleryOrientationPropertyList[] = { QT_GALLERY_ITEM_PROPERTY("height", "nfo:height(?x)", Int, CanRead | CanSort | CanFilter | IsResource), \ QT_GALLERY_ITEM_PROPERTY("width" , "nfo:width(?x)" , Int, CanRead | CanSort | CanFilter | IsResource) +#define QT_GALLERY_NFO_VISUAL_COMPOSITE_PROPERTIES \ + QT_GALLERY_COMPOSITE_PROPERTY("orientation", Int, qt_galleryOrientationPropertyList, QGalleryTrackerOrientationColumn::create, qt_writeOrientationCondition) /////// // File /////// @@ -741,7 +742,9 @@ static const QGalleryItemProperty qt_galleryOrientationPropertyList[] = { static const QGalleryItemProperty qt_galleryFilePropertyList[] = { - QT_GALLERY_NFO_FILEDATAOBJECT_PROPERTIES + QT_GALLERY_NFO_FILEDATAOBJECT_PROPERTIES, + QT_GALLERY_NFO_MEDIA_PROPERTIES, + QT_GALLERY_NFO_VISUAL_PROPERTIES }; #define QT_GALLERY_FILE_COMPOSITE_PROPERTIES \ @@ -749,7 +752,8 @@ static const QGalleryItemProperty qt_galleryFilePropertyList[] = static const QGalleryCompositeProperty qt_galleryFileCompositePropertyList[] = { - QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES + QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES, + QT_GALLERY_NFO_VISUAL_COMPOSITE_PROPERTIES }; //////// @@ -833,6 +837,7 @@ static const QGalleryItemProperty qt_galleryImagePropertyList[] = static const QGalleryCompositeProperty qt_galleryImageCompositePropertyList[] = { QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES, + QT_GALLERY_NFO_VISUAL_COMPOSITE_PROPERTIES }; //////// @@ -861,7 +866,8 @@ static const QGalleryItemProperty qt_galleryVideoPropertyList[] = static const QGalleryCompositeProperty qt_galleryVideoCompositePropertyList[] = { - QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES + QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES, + QT_GALLERY_NFO_VISUAL_COMPOSITE_PROPERTIES }; /////////// |