Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	qmake/library/qmakeevaluator.cpp
	(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
	src/corelib/kernel/qcore_mac_objc.mm
	src/gui/painting/qcolor.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31

1 files changed, 4 insertions, 7 deletions

diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index 02ed912323..99d067b7d7 100644
--- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
@@ -377,8 +377,8 @@ static QString glue(const QString &s1, const QString &s2)
 void tst_QUndoGroup::checkSignals()
 {
     QUndoGroup group;
-    QAction *undo_action = group.createUndoAction(0, QString("foo"));
-    QAction *redo_action = group.createRedoAction(0, QString("bar"));
+    const QScopedPointer<QAction> undo_action(group.createUndoAction(0, QString("foo")));
+    const QScopedPointer<QAction> redo_action(group.createRedoAction(0, QString("bar")));
     QSignalSpy indexChangedSpy(&group, SIGNAL(indexChanged(int)));
     QSignalSpy cleanChangedSpy(&group, SIGNAL(cleanChanged(bool)));
     QSignalSpy canUndoChangedSpy(&group, SIGNAL(canUndoChanged(bool)));
@@ -590,9 +590,6 @@ void tst_QUndoGroup::checkSignals()
                 true,       // indexChanged
                 true,       // undoChanged
                 true)       // redoChanged
-
-    delete undo_action;
-    delete redo_action;
 }
 
 void tst_QUndoGroup::addStackAndDie()
@@ -629,8 +626,8 @@ void tst_QUndoGroup::commandTextFormat()
     qApp->installTranslator(&translator);
 
     QUndoGroup group;
-    QAction *undo_action = group.createUndoAction(0);
-    QAction *redo_action = group.createRedoAction(0);
+    const QScopedPointer<QAction> undo_action(group.createUndoAction(0));
+    const QScopedPointer<QAction> redo_action(group.createRedoAction(0));
 
     QCOMPARE(undo_action->text(), QString("Undo-default-text"));
     QCOMPARE(redo_action->text(), QString("Redo-default-text"));