summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@jollamobile.com>2013-12-03 11:23:01 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-03 12:46:12 +0100
commitc3584c7e02791ecbff580083f782ae463437e397 (patch)
treed202829bec0e05e70b9ce19472f9a9368f34d1e8
parent3570f32d98ef46ea7ac8f014727f4c2cf59bda6f (diff)
Support the orientation value for all file types.
Change-Id: Ib829db574ff0888a9d6b899300889f242c50d3ec 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.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallery/tracker/qgallerytrackerschema.cpp b/src/gallery/tracker/qgallerytrackerschema.cpp
index 4b90675..5e9f3a3 100644
--- a/src/gallery/tracker/qgallerytrackerschema.cpp
+++ b/src/gallery/tracker/qgallerytrackerschema.cpp
@@ -698,10 +698,16 @@ static bool qt_writeOrientationCondition(
QT_GALLERY_ITEM_PROPERTY("lastAccessed" , "nfo:fileLastAccessed(?x)" , DateTime, CanRead | CanSort | CanFilter), \
QT_GALLERY_ITEM_PROPERTY("lastModified" , "nfo:fileLastModified(?x)" , DateTime, CanRead | CanSort | CanFilter)
+
+static const QGalleryItemProperty qt_galleryOrientationPropertyList[] = {
+ QT_GALLERY_ITEM_PROPERTY("_orientation", "nfo:orientation(?x)", String, CanRead | CanFilter)
+};
+
#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_NO_DEPENDENCIES("path" , String, QGalleryTrackerPathColumn::create , qt_writePathCondition), \
+ QT_GALLERY_COMPOSITE_PROPERTY("orientation", Int, qt_galleryOrientationPropertyList, QGalleryTrackerOrientationColumn::create, qt_writeOrientationCondition)
//nfo:Media : nfo:FileDataObject
// nfo:equipment, nfo:genre, nfo:averageBitrate, nfo:bitrateType, nfo:encodedBy, nfo:codec,
@@ -822,17 +828,11 @@ static const QGalleryItemProperty qt_galleryImagePropertyList[] =
QT_GALLERY_ITEM_PROPERTY("focalLength" , "nmm:focalLength(?x)" , Double , CanRead | CanWrite | CanSort | CanFilter),
QT_GALLERY_ITEM_PROPERTY("meteringMode" , "nmm:meteringMode(?x)" , String , CanRead | CanWrite | CanSort | CanFilter),
QT_GALLERY_ITEM_PROPERTY("whiteBalance" , "nmm:whiteBalance(?x)" , String , CanRead | CanWrite | CanSort | CanFilter),
- QT_GALLERY_ITEM_PROPERTY("_orientation", "nfo:orientation(?x)" , String, CanRead)
-};
-
-static const QGalleryItemProperty qt_galleryOrientationPropertyList[] = {
- QT_GALLERY_ITEM_PROPERTY("_orientation", "nfo:orientation(?x)", String, CanRead | CanFilter)
};
static const QGalleryCompositeProperty qt_galleryImageCompositePropertyList[] =
{
QT_GALLERY_NFO_FILEDATAOBJECT_COMPOSITE_PROPERTIES,
- QT_GALLERY_COMPOSITE_PROPERTY("orientation", Int, qt_galleryOrientationPropertyList, QGalleryTrackerOrientationColumn::create, qt_writeOrientationCondition)
};
////////