Merge lp:~qqworini/ubuntu-rssreader-app/fix-toolbar-bug-comment into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

add workaround comment as David requested

add workaround comment as David requested

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/55/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/504
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/55

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/55/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks!

review: Approve

=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-09-27 06:04:11 +0000
+++ feeds/AppendFeedPage.qml	2013-09-27 08:31:20 +0000
@@ -20,6 +20,9 @@
     //.property var selectedFeeds: null // Become local.
     property bool resultsReceived: false // Indicates that at least once results were received.
 
+    // Workaround for bug #1231137
+    // set the tools to null, then add the toolbar manually when enter this page
+
     tools: null
 
     ToolbarItems {

=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2013-09-27 06:04:11 +0000
+++ feeds/ChooseTopicPage.qml	2013-09-27 08:31:20 +0000
@@ -17,6 +17,9 @@
 
     signal topicChoosen(int topicId, var addedFeeds)
 
+    // Workaround for bug #1231137
+    // set the tools to null, then add the toolbar manually when enter this page
+
     tools: null
 
     ToolbarItems {