Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/kernel/qapplication.cpp
	tests/auto/qfileinfo/tst_qfileinfo.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index 6396e44..dba8a64 100644
--- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -224,7 +224,18 @@ void tst_QGraphicsSceneIndex::connectedToSceneRectChanged()
 {
 
     class MyScene : public QGraphicsScene
-    { public: using QGraphicsScene::receivers; };
+    {
+    public:
+#ifdef Q_CC_RVCT
+        //using keyword doesn't change visibility to public in RVCT2.2 compiler
+        inline int receivers(const char* signal) const
+        {
+            return QGraphicsScene::receivers(signal);
+        }
+#else
+        using QGraphicsScene::receivers;
+#endif
+    };
 
     MyScene scene; // Uses QGraphicsSceneBspTreeIndex by default.
     QCOMPARE(scene.receivers(SIGNAL(sceneRectChanged(const QRectF&))), 1);