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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (407 commits)
  Cherry pick fix for MOBILITY-1234 from Qt Mobility.
  Cherry pick fix for QTMOBILITY-408 from Qt Mobility.
  Cherry pick fix for MOBILITY-1194 from Qt Mobility.
  Fix compilation error on Symbian^4.
  Fix detection of OCC functionality.
  Cherry pick fix for MOBILITY-1194 from Qt Mobility.
  Fix signal emission of QDesktopWidget on Symbian.
  Don't run the QGL test on systems that does not have GL support.
  Adding missing image
  Fixed gcce linker error when linking against s60main built by armcc.
  Make it possible again to build Qt without webkit
  Fixed plugin build key for Symbian builds under Linux.
  Remove an useless assert from comp_func_SourceOver_sse2()
  QScriptEngineAgent: recompile all the function when installing a debugger.
  QScriptDeclarativeObject:  we need to save the current stack pointer.
  QScriptValue::objectId(): do not assert if the value is not a cell
  Implement the composition mode "Plus" with SSE2
  Clean the CompositionFunction tables of drawhelper
  Fix QT_NO_DATESTRING
  Check the gesturemanager pointer before accessing it.
  ...

1 files changed, 4 insertions, 0 deletions

diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 1d8706c..18480cc 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -2123,6 +2123,10 @@ void tst_QScriptValue::getSetProperty()
     QVERIFY(object.property(foo).strictlyEquals(num));
     QVERIFY(object.property("foo").strictlyEquals(num));
     QVERIFY(object.propertyFlags(foo) == 0);
+
+    // Setting index property on non-Array
+    object.setProperty(13, num);
+    QVERIFY(object.property(13).equals(num));
 }
 
 void tst_QScriptValue::arrayElementGetterSetter()