Remove handling of missing very old compiler feature check

Removes handling of missing Q_COMPILER_NULLPTR, Q_COMPILER_AUTODECL,
Q_COMPILER_LAMBDA, Q_COMPILER_VARIADIC_MACROS and
Q_COMPILER_AUTO_FUNCTION.

We haven't supported any compilers without these for a long time.

Change-Id: I3df88206516a25763e2c28b083733780f35a8764
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 4 insertions, 16 deletions

diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index e2bb7dab2a..28458c43c7 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -1499,7 +1499,7 @@ public:
 typedef MyObject* MyObjectPtr;
 Q_DECLARE_METATYPE(MyObjectPtr)
 
-#if defined(Q_COMPILER_VARIADIC_MACROS) && !defined(TST_QMETATYPE_BROKEN_COMPILER)
+#if !defined(TST_QMETATYPE_BROKEN_COMPILER)
 static QByteArray createTypeName(const char *begin, const char *va)
 {
     QByteArray tn(begin);
@@ -1697,7 +1697,7 @@ void tst_QMetaType::automaticTemplateRegistration()
     QVERIFY(qRegisterMetaType<UnregisteredTypeList>("UnregisteredTypeList") > 0);
   }
 
-#if defined(Q_COMPILER_VARIADIC_MACROS) && !defined(TST_QMETATYPE_BROKEN_COMPILER)
+#if !defined(TST_QMETATYPE_BROKEN_COMPILER)
 
     #define FOR_EACH_STATIC_PRIMITIVE_TYPE(F) \
         F(bool) \
@@ -1776,7 +1776,7 @@ void tst_QMetaType::automaticTemplateRegistration()
     CREATE_AND_VERIFY_CONTAINER(QHash, void*, void*)
     CREATE_AND_VERIFY_CONTAINER(QHash, const void*, const void*)
 
-#endif // Q_COMPILER_VARIADIC_MACROS
+#endif // !defined(TST_QMETATYPE_BROKEN_COMPILER)
 
 #define TEST_OWNING_SMARTPOINTER(SMARTPOINTER, ELEMENT_TYPE, FLAG_TEST, FROMVARIANTFUNCTION) \
     { \
@@ -2565,9 +2565,7 @@ Q_DECLARE_METATYPE(UndefinedFunction0);
 Q_DECLARE_METATYPE(UndefinedFunction1);
 Q_DECLARE_METATYPE(UndefinedFunction2);
 Q_DECLARE_METATYPE(UndefinedFunction3);
-#ifdef Q_COMPILER_VARIADIC_TEMPLATES
 Q_DECLARE_METATYPE(UndefinedFunction4);
-#endif
 
 QTEST_MAIN(tst_QMetaType)
 #include "tst_qmetatype.moc"
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index f51fb9bf49..4a27b5bffe 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -6029,7 +6029,6 @@ void tst_QObject::connectFunctorArgDifference()
     QStringListModel model;
     connect(&model, &QStringListModel::rowsInserted, SlotFunctor());
 
-#if defined(Q_COMPILER_LAMBDA)
     connect(&timer, &QTimer::timeout, [=](){});
     connect(&timer, &QTimer::objectNameChanged, [=](const QString &){});
     connect(qApp, &QCoreApplication::aboutToQuit, [=](){});
@@ -6037,7 +6036,6 @@ void tst_QObject::connectFunctorArgDifference()
     connect(&timer, &QTimer::objectNameChanged, [=](){});
     connect(&model, &QStringListModel::rowsInserted, [=](){});
     connect(&model, &QStringListModel::rowsInserted, [=](const QModelIndex &){});
-#endif
 
     QVERIFY(true);
 }
@@ -6075,7 +6073,6 @@ void tst_QObject::connectFunctorQueued()
     e.exec();
     QCOMPARE(status, 2);
 
-#if defined(Q_COMPILER_LAMBDA)
     status = 1;
     connect(&obj, &SenderObject::signal1, this, [&status] { status = 2; }, Qt::QueuedConnection);
 
@@ -6083,7 +6080,6 @@ void tst_QObject::connectFunctorQueued()
     QCOMPARE(status, 1);
     e.exec();
     QCOMPARE(status, 2);
-#endif
 }
 
 void tst_QObject::connectFunctorWithContext()
@@ -6117,7 +6113,6 @@ void tst_QObject::connectFunctorWithContext()
     e.exec();
     QCOMPARE(status, 2);
 
-#if defined(Q_COMPILER_LAMBDA)
     status = 1;
     connect(&obj, &SenderObject::signal1, this, [this, &status, &obj] { status = 2; QCOMPARE(sender(), &obj); }, Qt::QueuedConnection);
 
@@ -6125,7 +6120,6 @@ void tst_QObject::connectFunctorWithContext()
     QCOMPARE(status, 1);
     e.exec();
     QCOMPARE(status, 2);
-#endif
 
     // Free
     context->deleteLater();
@@ -6435,7 +6429,7 @@ void connectFunctorOverload_impl(Signal signal, int expOverload, QList<QVariant>
 
 void tst_QObject::connectFunctorOverloads()
 {
-#if defined (Q_COMPILER_DECLTYPE) && defined (Q_COMPILER_VARIADIC_TEMPLATES)
+#if defined (Q_COMPILER_VARIADIC_TEMPLATES)
     connectFunctorOverload_impl<ComplexFunctor>(&FunctorArgDifferenceObject::signal_ii, 1,
                                 (QList<QVariant>() << 1 << 2));
     connectFunctorOverload_impl<ComplexFunctor>(&FunctorArgDifferenceObject::signal_iiS, 1,
@@ -6609,7 +6603,6 @@ void tst_QObject::disconnectDoesNotLeakFunctor()
     }
     QCOMPARE(countedStructObjectsCount, 0);
     {
-#if defined(Q_COMPILER_LAMBDA)
         CountedStruct s;
         QCOMPARE(countedStructObjectsCount, 1);
         QTimer timer;
@@ -6619,7 +6612,6 @@ void tst_QObject::disconnectDoesNotLeakFunctor()
         QCOMPARE(countedStructObjectsCount, 2);
         QVERIFY(QObject::disconnect(c));
         QCOMPARE(countedStructObjectsCount, 1);
-#endif // Q_COMPILER_LAMBDA
     }
     QCOMPARE(countedStructObjectsCount, 0);
 }
@@ -6667,7 +6659,6 @@ void tst_QObject::contextDoesNotLeakFunctor()
     }
     QCOMPARE(countedStructObjectsCount, 0);
     {
-#if defined(Q_COMPILER_LAMBDA)
         CountedStruct s;
         QEventLoop e;
         ContextObject *context = new ContextObject;
@@ -6680,7 +6671,6 @@ void tst_QObject::contextDoesNotLeakFunctor()
         context->deleteLater();
         e.exec();
         QCOMPARE(countedStructObjectsCount, 1);
-#endif // Q_COMPILER_LAMBDA
     }
     QCOMPARE(countedStructObjectsCount, 0);
 }