Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Conflicts:
	src/gui/text/qfontdatabase.cpp
	src/gui/text/qharfbuzz_copy_p.h
	src/widgets/kernel/qapplication.cpp
	src/widgets/kernel/qcoreapplication.cpp

Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b

1 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/doc/snippets/mainwindowsnippet.cpp b/src/widgets/doc/snippets/mainwindowsnippet.cpp
index 1ba58ca0e76..a9a9012d461 100644
--- a/src/widgets/doc/snippets/mainwindowsnippet.cpp
+++ b/src/widgets/doc/snippets/mainwindowsnippet.cpp
@@ -55,10 +55,10 @@ void MainWindow::createMenus()
     //setMenuWidget(new QPushButton("Hello"));
     QMenu *menu = new QMenu("File");
     menu->addAction("Save &As");
-    
+
     QMenuBar *bar = new QMenuBar;
     bar->addMenu(menu);
-    
+
     setMenuWidget(new QWidget());
 }
 
@@ -84,9 +84,9 @@ void MainWindow::createDockWidgets()
 
 //! [0]
     QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this);
-    dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | 
+    dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea |
 				Qt::RightDockWidgetArea);
     dockWidget->setWidget(dockWidgetContents);
-    addDockWidget(Qt::LeftDockWidgetArea, dockWidget); 
+    addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
 //! [0]
 }