diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-06 16:07:23 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 18:26:47 +0200 |
commit | f1b9ba8c6ee6b991ef4e513bc4f39045fd55d1e6 (patch) | |
tree | cd587156a07344e98aca0cd1511075fe272bfec5 /examples/quick/demos/tweetsearch/content/TweetDelegate.qml | |
parent | 27deff6d2b5a9eb1d98cd7b377ab934a35086664 (diff) | |
parent | 1d3b9db5b54d8ae99c6b149c8d3d91eda19b5838 (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'examples/quick/demos/tweetsearch/content/TweetDelegate.qml')
-rw-r--r-- | examples/quick/demos/tweetsearch/content/TweetDelegate.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/demos/tweetsearch/content/TweetDelegate.qml b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml index 8cd22110d4..e8bfff437b 100644 --- a/examples/quick/demos/tweetsearch/content/TweetDelegate.qml +++ b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml @@ -103,7 +103,7 @@ Item { Text { id: name - text: Helper.realName(model.name) + text: model.name anchors { left: avatar.right; leftMargin: 10; top: avatar.top; topMargin: -3 } font.pixelSize: 12 font.bold: true @@ -121,7 +121,7 @@ Item { color: "#adebff" linkColor: "white" onLinkActivated: { - var tag = link.split("http://search.twitter.com/search?q=%23") + var tag = link.split("https://twitter.com/search?q=%23") var user = link.split("https://twitter.com/") if (tag[1] != undefined) { mainListView.positionViewAtBeginning() @@ -166,7 +166,7 @@ Item { Text { id: username - text: Helper.twitterName(model.name) + text: model.twitterName x: 10; anchors { top: avatar2.top; topMargin: -3 } font.pixelSize: 12 font.bold: true |