Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml

Conflicts:
	src/qmlui/res.qrc
	src/src.pro

diff --cc src/qmlui/res.qrc
index 0bd28d2,2a5fecc..dd37b58
--- 1/src/qmlui/res.qrc
--- 2/src/qmlui/res.qrc
+++ b/src/qmlui/res.qrc
@@@ -31,6 -31,7 +31,8 @@@
          <file>ListBase.qml</file>
          <file>DetailEditorRow.qml</file>
          <file>PanelSelectorButton.qml</file>
 +        <file>ExtendedTextEdit.qml</file>
+         <file>res/busy.png</file>
+         <file>BusyIndicator.qml</file>
      </qresource>
  </RCC>

diff --cc src/src.pro
index cc1e693,b524559..1b7c3ed
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -206,7 -206,7 +206,8 @@@ OTHER_FILES += qmlui/Main.qml 
      qmlui/LocationsView.qml \
      qmlui/DetailEditorRow.qml \
      qmlui/PanelSelectorButton.qml \
-     qmlui/ExtendedTextEdit.qml
++    qmlui/ExtendedTextEdit.qml \
+     qmlui/BusyIndicator.qml
  
  QT += network \
      webkit  \