summaryrefslogtreecommitdiffstats
path: root/demos/declarative/twitter/twitter.qml
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-09 05:19:09 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-09 05:19:09 (GMT)
commit475abec27948923ae6de74db53b137f19c661601 (patch)
tree35f572bd7d17390e35164d2b8882c67bb22ff82e /demos/declarative/twitter/twitter.qml
parent95ad31adca64f639712fa378d25aa3e552b3dc72 (diff)
parentce69639de67ae74caedb545c9c94aaae6512243f (diff)
downloadQt-475abec27948923ae6de74db53b137f19c661601.zip
Qt-475abec27948923ae6de74db53b137f19c661601.tar.gz
Qt-475abec27948923ae6de74db53b137f19c661601.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos/declarative/twitter/twitter.qml')
-rw-r--r--demos/declarative/twitter/twitter.qml9
1 files changed, 4 insertions, 5 deletions
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 583bf7f..0e3ec3e 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -15,12 +15,11 @@ Item {
toolBar.button2Label = "Return home";
}
}
+ function setUser(str){hack.running = true; tmpStr = str}
+ function reallySetUser(){rssModel.tags = tmpStr;}
+
//Workaround for bug 260266
- Timer{ interval: 1; running: false; repeat: false; onTriggered: reallySetUser(); id:hack }
- Script {
- function setUser(str){hack.running = true; tmpStr = str}
- function reallySetUser(){rssModel.tags = tmpStr;}
- }
+ Timer{ interval: 1; running: false; repeat: false; onTriggered: screen.reallySetUser(); id:hack }
//TODO: better way to return to the auth screen
Keys.onEscapePressed: rssModel.authName=''