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:
  Support device orientation in harmattan
  Connect property alias change signals on use
  Doc fix.
  Fix setting PathView offset when all visible items are removed.
  Rename toolbar button.
  Update import statement.
  Fixes assert in QDeclarativeWebView
  Do not show 'More' button when in fullscreen view.
  Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
  Allow default QApplication::startDragDistance() to be defined in platformdefs.h
  Autotest
  Ensure the TextInput cursor blinks immediately when enabled.
  Fix minehunt execution from QtDemo
  Update QtGui def files
  Ensure PathView updates positions when path changes.
  Create Loader components in correct context

2 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml
new file mode 100644
index 0000000..7944deb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0
+
+QtObject {
+    id: root
+
+    property alias aliasProperty: root.realProperty
+    onAliasPropertyChanged: root.test = true
+
+    property int realProperty: 0
+
+    property bool test: false
+
+    Component.onCompleted: {
+        root.realProperty = 10;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 8609a7e..9a8c944 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -119,6 +119,7 @@ private slots:
     void cppnamespace();
     void aliasProperties();
     void aliasPropertiesAndSignals();
+    void aliasPropertyChangeSignals();
     void componentCompositeType();
     void i18n();
     void i18n_data();
@@ -1816,6 +1817,19 @@ void tst_qdeclarativelanguage::initTestCase()
     out.write(in.readAll());
 }
 
+void tst_qdeclarativelanguage::aliasPropertyChangeSignals()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyChangeSignals.qml"));
+
+    VERIFY_ERRORS(0);
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+
+    QCOMPARE(o->property("test").toBool(), true);
+
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativelanguage)
 
 #include "tst_qdeclarativelanguage.moc"