summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenu <venugopal.shivashankar@digia.com>2014-09-25 18:04:21 +0200
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2014-09-26 12:12:38 +0200
commitb90e043af09955d94a7a9555f11b5d6f3add4c3a (patch)
treed0e03f84a2fea76e55936eb076994ded75ef42de
parent844e728a278caefb9765c474639305b8a037bee8 (diff)
downloadqtlocation-b90e043af09955d94a7a9555f11b5d6f3add4c3a.tar.gz
Updated the request URL to use https instead of http
The request to search the photos on flickr needs SSL, without which the search fails to get the required results. Also updated the example's GridDelegate to scale the photos based on pixelDensity. Otherwise the photos look too small on high DPI devices. Task-number: QTBUG-37203 Change-Id: I5f3385e99868bdfae6e62d1ade5acea2ac536b65 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--examples/positioning/flickr/flickrcommon/RestModel.qml2
-rw-r--r--examples/positioning/flickr/flickrmobile/GridDelegate.qml5
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/positioning/flickr/flickrcommon/RestModel.qml b/examples/positioning/flickr/flickrcommon/RestModel.qml
index d8d5e87e..26bdf1e4 100644
--- a/examples/positioning/flickr/flickrcommon/RestModel.qml
+++ b/examples/positioning/flickr/flickrcommon/RestModel.qml
@@ -45,7 +45,7 @@ import QtQuick.XmlListModel 2.0
XmlListModel {
property variant coordinate
- source: "http://api.flickr.com/services/rest/?" +
+ source: "https://api.flickr.com/services/rest/?" +
"min_taken_date=2000-01-01+0:00:00&" +
"extras=date_taken&" +
"method=flickr.photos.search&" +
diff --git a/examples/positioning/flickr/flickrmobile/GridDelegate.qml b/examples/positioning/flickr/flickrmobile/GridDelegate.qml
index 4eca4d8b..54f6b0eb 100644
--- a/examples/positioning/flickr/flickrmobile/GridDelegate.qml
+++ b/examples/positioning/flickr/flickrmobile/GridDelegate.qml
@@ -39,6 +39,7 @@
****************************************************************************/
import QtQuick 2.0
+ import QtQuick.Window 2.0
Component {
id: photoDelegate
@@ -78,11 +79,11 @@
states: [
State {
name: "Show"; when: thumb.status == Image.Ready
- PropertyChanges { target: scaleMe; scale: 1 }
+ PropertyChanges { target: scaleMe; scale: Math.round(Screen.pixelDensity / 4) }
},
State {
name: "Details"
- PropertyChanges { target: scaleMe; scale: 1 }
+ PropertyChanges { target: scaleMe; scale: Math.round(Screen.pixelDensity / 4)}
ParentChange { target: wrapper; parent: imageDetails.frontContainer }
PropertyChanges { target: wrapper; x: 20; y: 60; z: 1000 }
PropertyChanges { target: background; state: "DetailedView" }