2 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
index 4dc620e6ab..d1bb89f549 100644
--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
@@ -470,9 +470,8 @@ namespace QTest {
             "TEMPLATE = app\n"
             "\n"
             "TARGET   = externaltest\n"
-            "CONFIG   -= app_bundle\n"        // for the Mac
             "CONFIG   -= debug_and_release\n"
-            "CONFIG   += console\n"
+            "CONFIG   += cmdline\n"
             "DESTDIR  = .\n"
             "OBJECTS_DIR = .\n"
             "UI_DIR   = .\n"
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index ade9c5e754..19b2aa02f3 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -89,9 +89,7 @@ private slots:
 #endif
     void constCorrectness();
     void customDeleter();
-#ifdef Q_COMPILER_LAMBDA
     void lambdaCustomDeleter();
-#endif
     void creating();
     void creatingCvQualified();
     void creatingVariadic();
@@ -573,10 +571,10 @@ void tst_QSharedPointer::useOfForwardDeclared()
 
     // move assignment:
     QSharedPointer<ForwardDeclared> sp4;
-    sp4 = qMove(sp);
+    sp4 = std::move(sp);
 
     // and move constuction:
-    QSharedPointer<ForwardDeclared> sp5 = qMove(sp2);
+    QSharedPointer<ForwardDeclared> sp5 = std::move(sp2);
 
     // swapping:
     sp4.swap(sp3);
@@ -1670,7 +1668,6 @@ void tst_QSharedPointer::customDeleter()
     safetyCheck();
 }
 
-#ifdef Q_COMPILER_LAMBDA
 // The compiler needs to be in C++11 mode and to support lambdas
 void tst_QSharedPointer::lambdaCustomDeleter()
 {
@@ -1698,7 +1695,6 @@ void tst_QSharedPointer::lambdaCustomDeleter()
     }
     safetyCheck();
 }
-#endif
 
 void customQObjectDeleterFn(QObject *obj)
 {
@@ -2233,11 +2229,9 @@ void tst_QSharedPointer::invalidConstructs_data()
         << &QTest::QExternalTest::tryCompileFail
         << "struct IncompatibleCustomDeleter { void operator()(int *); };\n"
            "QSharedPointer<Data> ptr(new Data, IncompatibleCustomDeleter());\n";
-#ifdef Q_COMPILER_LAMBDA
     QTest::newRow("incompatible-custom-lambda-deleter")
         << &QTest::QExternalTest::tryCompileFail
         << "QSharedPointer<Data> ptr(new Data, [](int *) {});\n";
-#endif
 }
 
 void tst_QSharedPointer::invalidConstructs()