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, 3 insertions, 3 deletions

diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
index 5e7577f28b..fa108a21b3 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
@@ -64,7 +64,7 @@ void CustomProxy::paintWindowFrame(QPainter *painter, const QStyleOptionGraphics
                                    QWidget *widget)
 {
     const QColor color(0, 0, 0, 64);
-   
+
     QRectF r = windowFrameRect();
     QRectF right(r.right(), r.top() + 10, 10, r.height() - 10);
     QRectF bottom(r.left() + 10, r.bottom(), r.width(), 10);
@@ -159,7 +159,7 @@ void CustomProxy::zoomIn()
 {
     if (timeLine->direction() != QTimeLine::Forward)
         timeLine->setDirection(QTimeLine::Forward);
-    if (timeLine->state() == QTimeLine::NotRunning) 
+    if (timeLine->state() == QTimeLine::NotRunning)
         timeLine->start();
 }
 
@@ -167,6 +167,6 @@ void CustomProxy::zoomOut()
 {
     if (timeLine->direction() != QTimeLine::Backward)
         timeLine->setDirection(QTimeLine::Backward);
-    if (timeLine->state() == QTimeLine::NotRunning) 
+    if (timeLine->state() == QTimeLine::NotRunning)
         timeLine->start();
 }