Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Remove debug.
  Snake: Don't use Behavior with states.
  QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu
  Fix application exiting in embedded qml examples
  QDeclarativeDebug: Destroy incoming connections if already connected
  Fix VisualDataModel model update handling when rootIndex is specified.
  Improve test reliability when running in parallel with other tests.
  Improve stability of test on loaded hw.
  Improve stability of test on loaded hw.

2 files changed, 3 insertions, 1 deletions

diff --git a/demos/embedded/qmleasing/deployment.pri b/demos/embedded/qmleasing/deployment.pri
index 984f5c8..d3621cb 100644
--- a/demos/embedded/qmleasing/deployment.pri
+++ b/demos/embedded/qmleasing/deployment.pri
@@ -4,5 +4,5 @@ symbian {
     qmleasing_uid3 = A000E3FE
     qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3
 }
-qmleasing_files.sources = $$qmleasing_src/easing.qml
+qmleasing_files.sources = $$qmleasing_src/easing.qml $$qmleasing_src/content
 DEPLOYMENT += qmleasing_files
diff --git a/demos/embedded/qmleasing/qmleasing.cpp b/demos/embedded/qmleasing/qmleasing.cpp
index d326468..713fe67 100644
--- a/demos/embedded/qmleasing/qmleasing.cpp
+++ b/demos/embedded/qmleasing/qmleasing.cpp
@@ -42,6 +42,7 @@
 #include <QtCore/QFileInfo>
 #include <QtGui/QApplication>
 #include <QtDeclarative/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
 {
@@ -51,6 +52,7 @@ int main(int argc, char *argv[])
     QDeclarativeView view;
     view.setSource(QUrl(mainQmlApp));
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
 
 #if defined(QT_KEYPAD_NAVIGATION)
     QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);