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

Conflicts:
	src/gui/text/qfontengine_mac.mm
	tests/auto/qdiriterator/tst_qdiriterator.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 6ca6bfb8ed..b2c7f4f730 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -51,6 +51,7 @@
 #include <QMessageBox>
 #include <QAtomicInt>
 #include "qdeclarativetester.h"
+#include <private/qdeclarativedebughelper_p.h>
 
 QT_USE_NAMESPACE
 
@@ -538,6 +539,8 @@ int main(int argc, char ** argv)
         QApplication::setGraphicsSystem("raster");
 #endif
 
+    QDeclarativeDebugHelper::enableDebugging();
+
     Application app(argc, argv);
     app.setApplicationName("QtQmlViewer");
     app.setOrganizationName("Nokia");