From 6f8e9ff84b959ba763fcff18f0c519075ea1df03 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Sat, 4 Jun 2022 00:54:12 +0200 Subject: ECMQtDeclareLoggingCategory: drop support for Qt < 5.4 Given ECM is released tightly bundled with KF, which itself requires Qt 5.15 now, and no Linux distribution is known by repology.org which ships older Qt, but current ECM, that support is considered of no more use. --- tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp') diff --git a/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp b/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp index 79a3cd3c..f4181d11 100644 --- a/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp +++ b/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp @@ -28,12 +28,6 @@ int main(int argc, char **argv) qWarning("log1 category was \"%s\", expected \"log.one\"", log1().categoryName()); success = false; } -#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) - if (!log1().isDebugEnabled()) { - qWarning("log1 debug messages were not enabled"); - success = false; - } -#else if (log1().isDebugEnabled()) { qWarning("log1 debug messages were enabled"); success = false; @@ -42,18 +36,11 @@ int main(int argc, char **argv) qWarning("log1 warning messages were not enabled"); success = false; } -#endif if (foo::bar::log2().categoryName() != QLatin1String("log.two")) { qWarning("log2 category was \"%s\", expected \"log.two\"", foo::bar::log2().categoryName()); success = false; } -#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) - if (!foo::bar::log2().isDebugEnabled()) { - qWarning("log2 debug messages were not enabled"); - success = false; - } -#else if (foo::bar::log2().isDebugEnabled()) { qWarning("log2 debug messages were enabled"); success = false; @@ -62,18 +49,11 @@ int main(int argc, char **argv) qWarning("log2 warning messages were not enabled"); success = false; } -#endif if (log3().categoryName() != QLatin1String("three")) { qWarning("log3 category was \"%s\", expected \"three\"", log3().categoryName()); success = false; } -#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) - if (!log3().isDebugEnabled()) { - qWarning("log3 debug messages were not enabled"); - success = false; - } -#else if (log3().isDebugEnabled()) { qWarning("log3 debug messages were enabled"); success = false; @@ -86,7 +66,6 @@ int main(int argc, char **argv) qWarning("log3 critical messages were not enabled"); success = false; } -#endif return success ? 0 : 1; } -- cgit v1.2.1