From 8a558271986ad8016b7c2d413f86362a2aa33f6d Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Thu, 26 Jan 2023 14:58:23 +0100 Subject: [PATCH] Remove superfluous QT_VERSION_CHECK tests Change-Id: I09345f1e0cd23591de7a9fe545076cd8a951ee73 Reviewed-by: Ulf Hermann --- src/qml/types/qqmlconnections.cpp | 2 -- src/qmltest/qtestoptions_p.h | 5 ----- 2 files changed, 7 deletions(-) diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index 1527a2ea34..e69e0087e1 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -246,12 +246,10 @@ void QQmlConnections::connectSignals() if (d->bindings.isEmpty()) { connectSignalsToMethods(); } else { -#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) if (lcQmlConnections().isWarningEnabled()) { qmlWarning(this) << tr("Implicitly defined onFoo properties in Connections are deprecated. " "Use this syntax instead: function onFoo() { ... }"); } -#endif connectSignalsToBindings(); } } diff --git a/src/qmltest/qtestoptions_p.h b/src/qmltest/qtestoptions_p.h index 3b2a029a3a..3e2d01a84a 100644 --- a/src/qmltest/qtestoptions_p.h +++ b/src/qmltest/qtestoptions_p.h @@ -15,12 +15,7 @@ // We mean it. // -#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) -# include -# include -#else # include -#endif #include #include