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

3 files changed, 54 insertions, 55 deletions

diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index a53da5275c..bbd71a9284 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -363,6 +363,9 @@ void tst_QScroller::scrollerProperties()
 
 void tst_QScroller::scrollTo()
 {
+#ifdef Q_OS_MAC
+    QSKIP("Flakey test - https://bugreports.qt-project.org/browse/QTBUG-29950");
+#endif
     {
         tst_QScrollerWidget *sw = new tst_QScrollerWidget();
         sw->scrollArea = QRectF( 0, 0, 1000, 1000 );
@@ -389,11 +392,9 @@ void tst_QScroller::scrollTo()
 
 void tst_QScroller::scroll()
 {
-#if defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-    QSKIP("Mac OS X < 10.6 does not support QTouchEvents");
-    return;
+#ifdef Q_OS_MAC
+    QSKIP("Flakey test - https://bugreports.qt-project.org/browse/QTBUG-30133");
 #endif
-
 #ifndef QT_NO_GESTURES
     // -- good case. normal scroll
     tst_QScrollerWidget *sw = new tst_QScrollerWidget();
@@ -436,11 +437,9 @@ void tst_QScroller::scroll()
 
 void tst_QScroller::overshoot()
 {
-#if defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-    QSKIP("Mac OS X < 10.6 does not support QTouchEvents");
-    return;
+#ifdef Q_OS_MAC
+    QSKIP("Flakey test - https://bugreports.qt-project.org/browse/QTBUG-29950");
 #endif
-
 #ifndef QT_NO_GESTURES
     tst_QScrollerWidget *sw = new tst_QScrollerWidget();
     sw->scrollArea = QRectF(0, 0, 1000, 1000);
diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index c8a12a9866..ddab98ebc6 100644
--- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
@@ -599,7 +599,7 @@ void tst_QUndoGroup::addStackAndDie()
 {
     // Test that QUndoStack doesn't keep a reference to QUndoGroup after the
     // group is deleted.
-    QUndoStack *stack = new QUndoStack; 
+    QUndoStack *stack = new QUndoStack;
     QUndoGroup *group = new QUndoGroup;
     group->addStack(stack);
     delete group;
diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
index 9b48dc7798..4556816655 100644
--- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
+++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
@@ -290,52 +290,52 @@ static void checkState(QSignalSpy &redoTextChangedSpy,
                        const bool _undoChanged,
                        const bool _redoChanged)
 {
-    QCOMPARE(stack.count(), _count); 
-    QCOMPARE(stack.isClean(), _clean); 
-    QCOMPARE(stack.index(), _index); 
-    QCOMPARE(stack.canUndo(), _canUndo); 
-    QCOMPARE(stack.undoText(), QString(_undoText)); 
-    QCOMPARE(stack.canRedo(), _canRedo); 
-    QCOMPARE(stack.redoText(), QString(_redoText)); 
-    if (_indexChanged) { 
-        QCOMPARE(indexChangedSpy.count(), 1); 
-        QCOMPARE(indexChangedSpy.at(0).at(0).toInt(), _index); 
-        indexChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(indexChangedSpy.count(), 0); 
-    } 
-    if (_cleanChanged) { 
-        QCOMPARE(cleanChangedSpy.count(), 1); 
-        QCOMPARE(cleanChangedSpy.at(0).at(0).toBool(), _clean); 
-        cleanChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(cleanChangedSpy.count(), 0); 
-    } 
-    if (_undoChanged) { 
-        QCOMPARE(canUndoChangedSpy.count(), 1); 
-        QCOMPARE(canUndoChangedSpy.at(0).at(0).toBool(), _canUndo); 
-        QCOMPARE(undoAction->isEnabled(), _canUndo); 
-        QCOMPARE(undoTextChangedSpy.count(), 1); 
-        QCOMPARE(undoTextChangedSpy.at(0).at(0).toString(), QString(_undoText)); 
-        QCOMPARE(undoAction->text(), glue("foo", _undoText)); 
-        canUndoChangedSpy.clear(); 
-        undoTextChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(canUndoChangedSpy.count(), 0); 
-        QCOMPARE(undoTextChangedSpy.count(), 0); 
-    } 
-    if (_redoChanged) { 
-        QCOMPARE(canRedoChangedSpy.count(), 1); 
-        QCOMPARE(canRedoChangedSpy.at(0).at(0).toBool(), _canRedo); 
-        QCOMPARE(redoAction->isEnabled(), _canRedo); 
-        QCOMPARE(redoTextChangedSpy.count(), 1); 
-        QCOMPARE(redoTextChangedSpy.at(0).at(0).toString(), QString(_redoText)); 
-        QCOMPARE(redoAction->text(), glue("bar", _redoText)); 
-        canRedoChangedSpy.clear(); 
-        redoTextChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(canRedoChangedSpy.count(), 0); 
-        QCOMPARE(redoTextChangedSpy.count(), 0); 
+    QCOMPARE(stack.count(), _count);
+    QCOMPARE(stack.isClean(), _clean);
+    QCOMPARE(stack.index(), _index);
+    QCOMPARE(stack.canUndo(), _canUndo);
+    QCOMPARE(stack.undoText(), QString(_undoText));
+    QCOMPARE(stack.canRedo(), _canRedo);
+    QCOMPARE(stack.redoText(), QString(_redoText));
+    if (_indexChanged) {
+        QCOMPARE(indexChangedSpy.count(), 1);
+        QCOMPARE(indexChangedSpy.at(0).at(0).toInt(), _index);
+        indexChangedSpy.clear();
+    } else {
+        QCOMPARE(indexChangedSpy.count(), 0);
+    }
+    if (_cleanChanged) {
+        QCOMPARE(cleanChangedSpy.count(), 1);
+        QCOMPARE(cleanChangedSpy.at(0).at(0).toBool(), _clean);
+        cleanChangedSpy.clear();
+    } else {
+        QCOMPARE(cleanChangedSpy.count(), 0);
+    }
+    if (_undoChanged) {
+        QCOMPARE(canUndoChangedSpy.count(), 1);
+        QCOMPARE(canUndoChangedSpy.at(0).at(0).toBool(), _canUndo);
+        QCOMPARE(undoAction->isEnabled(), _canUndo);
+        QCOMPARE(undoTextChangedSpy.count(), 1);
+        QCOMPARE(undoTextChangedSpy.at(0).at(0).toString(), QString(_undoText));
+        QCOMPARE(undoAction->text(), glue("foo", _undoText));
+        canUndoChangedSpy.clear();
+        undoTextChangedSpy.clear();
+    } else {
+        QCOMPARE(canUndoChangedSpy.count(), 0);
+        QCOMPARE(undoTextChangedSpy.count(), 0);
+    }
+    if (_redoChanged) {
+        QCOMPARE(canRedoChangedSpy.count(), 1);
+        QCOMPARE(canRedoChangedSpy.at(0).at(0).toBool(), _canRedo);
+        QCOMPARE(redoAction->isEnabled(), _canRedo);
+        QCOMPARE(redoTextChangedSpy.count(), 1);
+        QCOMPARE(redoTextChangedSpy.at(0).at(0).toString(), QString(_redoText));
+        QCOMPARE(redoAction->text(), glue("bar", _redoText));
+        canRedoChangedSpy.clear();
+        redoTextChangedSpy.clear();
+    } else {
+        QCOMPARE(canRedoChangedSpy.count(), 0);
+        QCOMPARE(redoTextChangedSpy.count(), 0);
     }
 }