Query device maker and model from QtMobility DeviceInfo

diff --git a/qml/PostCapturePage.qml b/qml/PostCapturePage.qml
index dbdb0a0..327a15e 100644 (file)
--- a/qml/PostCapturePage.qml
+++ b/qml/PostCapturePage.qml
@@ -37,7 +37,7 @@ Page {
                 pathItemCount: 3
 
                 model: SparqlListModel {
-                        query: "SELECT nie:url(?urn) AS ?url tracker:id(?urn) AS ?trackerid nie:mimeType(?urn) AS ?mime WHERE { ?urn rdf:type nfo:Media .  ?urn nfo:equipment \"urn:equipment:Nokia:N950:\" ; tracker:available \"true\"^^xsd:boolean  OPTIONAL { ?urn nie:contentCreated ?created }   }  ORDER BY DESC (?created)"
+                        query: "SELECT nie:url(?urn) AS ?url tracker:id(?urn) AS ?trackerid nie:mimeType(?urn) AS ?mime WHERE { ?urn rdf:type nfo:Media .  ?urn nfo:equipment \"urn:equipment:" + deviceInfo.manufacturer + ":" + deviceInfo.model + ":\" ; tracker:available \"true\"^^xsd:boolean  OPTIONAL { ?urn nie:contentCreated ?created }   }  ORDER BY DESC (?created)"
 
                         connection: SparqlConnection {
                                 id: connection

diff --git a/qml/main.qml b/qml/main.qml
index 0a3acb3..bb560a7 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -4,6 +4,7 @@ import com.nokia.meego 1.1
 import com.nokia.extras 1.1
 import QtCamera 1.0
 import CameraPlus 1.0
+import QtMobility.systeminfo 1.2
 
 // TODO: metadata creator name, gps, geotags
 // TODO: resolutions and aspect ratios
@@ -49,6 +50,10 @@ PageStackWindow {
                 error.show();
         }
 
+        DeviceInfo {
+                id: deviceInfo
+        }
+
         FSMonitor {
                 id: fileSystem
         }