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

Conflicts:
	bin/syncqt
	demos/declarative/snake/content/snake.js
	demos/declarative/snake/snake.qml
	doc/src/development/qmake-manual.qdoc
	src/corelib/plugin/plugin.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/kernel/qdesktopwidget_win.cpp
	src/gui/painting/qdrawhelper.cpp
	tests/auto/qdir/tst_qdir.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/tutorials/modelview/7_selections/main.cpp b/examples/tutorials/modelview/7_selections/main.cpp
index 7be212e..59e82ef 100644..100755
--- a/examples/tutorials/modelview/7_selections/main.cpp
+++ b/examples/tutorials/modelview/7_selections/main.cpp
@@ -39,12 +39,12 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include "modelview.h"
+#include "mainwindow.h"
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    ModelView w;
+    MainWindow w;
     w.show();
     return a.exec();
 }