Merge lp:~nik90/ubuntu-calendar-app/remove-qmlproject-hacks into lp:ubuntu-calendar-app

[Nekhelesh Ramananthan]

Removed .qmlproject file and also the desktop file hack. Developers should now open the CMakeList.txt file for development in Qtcreator instead of the .qmlproject file.

With zbenjamin's cmake fixes, calendar app is now ready to remove .qmlproject and also the desktop file hack we had in place. I have removed them and confirmed to test it running on emulator, desktop and phone.

[Nekhelesh Ramananthan (nik90)]

From now on, everyone should just open the cmakelist.txt file in their qtcreator for development.

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

FAILED: Continuous integration, rev:439
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/782/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/255
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/340

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

review: Needs Fixing (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

Ok

review: Approve

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

review: Approve (continuous-integration)

=== removed file 'calendar-app.qmlproject'
--- calendar-app.qmlproject	2013-09-26 05:49:31 +0000
+++ calendar-app.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* File generated by Qt Creator, version 2.6.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "calendar.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* Shows the README files in the project view */
-    Files {
-        filter: "README*"
-    }
-    /* Shows the translation files and the .pro file used to generate the .pot template */
-    Files {
-        filter: "*.po*"
-    }
-    Files {
-        filter: "*.pro"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/lib/i386-linux-gnu/qt5/qml/", "/usr/lib/x86_64-linux-gnu/qt5/qml" ]
-}

=== removed file 'com.ubuntu.calendar.desktop'
--- com.ubuntu.calendar.desktop	2014-07-02 06:45:58 +0000
+++ com.ubuntu.calendar.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=qmlscene calendar.qml
-Icon=[e-mail]
-_Name=Calendar
-_Comment=A calendar for Ubuntu which syncs with online accounts.
-_Keywords=calendar;event;day;week;year;appointment;meeting;
-X-Ubuntu-Touch=true