Merge lp:~qunengrong/ubuntu-calendar-app/trunk into lp:ubuntu-calendar-app

[Neo Nengrong Qu]

added importPaths for i386;"/usr/lib/x86_64-linux-gnu/qt5/qml"
so we can test on a 32-bit host;

[Neo Nengrong Qu (qunengrong)]

maybe the best way is to improve the .qmlproject file syntax, so we can add some conditional rule to set proper importPaths

[Frank Mertens (frankencode)]

I have verified, that the QtCreator complains about missing import paths (design view), if the path is missing for the current host architecture. For amd64 that won't help much, QtCreator crashes shortly thereafter anyway...

review: Approve (tested the new import paths with qtcreator)

[Frank Mertens (frankencode)]

@Nengrong: If QtCreator crashes for you all the time, too, try using it for code editing only. Although even for code editing it has currently severe bugs. For instance it is currently not striping whitespace correctly, which I remember worked some time ago. Maybe there is a flag to enable it somehow. Anyways, do you know that you can run the app just by issuing 'qmlscene calendar.qml' ?

[Neo Nengrong Qu (qunengrong)]

@frank,
currently i mainly use qtcreator to view code , and browse codes, but without proper import paths the qml imports the packages not found will be underlined with red color; so the call of external tool qmlscene shall fail; also can't follow some function in the qml file, becase the package was not found;

either add the correct path to importPaths or set it to the env $QML_IMPORT_PATH , everything goes fine; and each time for a test, i'd first view the qml file on my host laptop with qmlscene, and then test on my nexus4 with hotkey ctrl+F12;

thanks for your review and reply;

> @Nengrong: If QtCreator crashes for you all the time, too, try using it for
> code editing only. Although even for code editing it has currently severe
> bugs. For instance it is currently not striping whitespace correctly, which I
> remember worked some time ago. Maybe there is a flag to enable it somehow.
> Anyways, do you know that you can run the app just by issuing 'qmlscene
> calendar.qml' ?

[lp:~qunengrong/ubuntu-calendar-app/trunk]

11. By Frank Mertens on 2013-03-27

Merged the data-service branch manually.

12. By Frank Mertens on 2013-03-27

Make the i386 QtCreator underline less code with red markers

=== modified file 'calendar.qmlproject'
--- calendar.qmlproject	2013-02-12 16:27:52 +0000
+++ calendar.qmlproject	2013-03-25 17:42:37 +0000
@@ -16,5 +16,5 @@
         directory: "."
     }
     /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
+    importPaths: [ "." ,"/usr/lib/i386-linux-gnu/qt5/qml/", "/usr/lib/x86_64-linux-gnu/qt5/qml" ]
 }