Merge lp:~vthompson/ubuntu-calendar-app/revert-commit-247 into lp:ubuntu-calendar-app

[Victor Thompson]

Revert commit #247

This branch reverts commit #247. The capability required to display the window title has landed. I'm not even sure the MP in the code commentary was the correct one.

I'd also like to add that fixing this needs to be done quickly if any testing is to be done on the device. Pushing the Calendar app to the click store should also be held hostage until this is fixed, because the app is effectively broken.

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

PASSED: Continuous integration, rev:254
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/413/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2225
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/413
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/413
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/247

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Works fine, thanks

review: Approve

=== modified file 'calendar.qml'
--- calendar.qml	2014-04-19 21:22:21 +0000
+++ calendar.qml	2014-04-26 00:09:59 +0000
@@ -1,18 +1,12 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
-import QtQuick.Window 2.0
 
 import "dateExt.js" as DateExt
 
 MainView {
     id: mainView
 
-    // Work-around until this branch lands:
-    // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496 
-    property bool windowActive: typeof window != 'undefined'
-    onWindowActiveChanged: window.title = i18n.tr("Calendar")
-
     // Argument during startup
     Arguments {
         id: args;