diff --git a/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp b/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp index 878f5a1c80..bdc197bf51 100644 --- a/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp +++ b/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp @@ -41,17 +41,10 @@ void Plugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "Decoration"); qmlRegisterType(uri, 1, 0, "Button"); qmlRegisterType(uri, 1, 0, "ButtonsModel"); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); -#else qmlRegisterAnonymousType(uri, 1); qmlRegisterAnonymousType(uri, 1); qmlRegisterAnonymousType(uri, 1); qmlRegisterAnonymousType(uri, 1); -#endif } } diff --git a/kcmkwin/kwindecoration/kcm.cpp b/kcmkwin/kwindecoration/kcm.cpp index afd5236462..b4f8ddda13 100644 --- a/kcmkwin/kwindecoration/kcm.cpp +++ b/kcmkwin/kwindecoration/kcm.cpp @@ -68,15 +68,9 @@ KCMKWinDecoration::KCMKWinDecoration(QObject *parent, const QVariantList &argume QStringLiteral("vpilo@coldshock.net")); setAboutData(about); setButtons(Apply | Default | Help); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); -#else qmlRegisterAnonymousType("org.kde.kwin.KWinDecoration", 1); qmlRegisterAnonymousType("org.kde.kwin.KWinDecoration", 1); qmlRegisterAnonymousType("org.kde.kwin.KWinDecoration", 1); -#endif m_proxyThemesModel->setSourceModel(m_themesModel); m_proxyThemesModel->setFilterCaseSensitivity(Qt::CaseInsensitive); m_proxyThemesModel->setSortCaseSensitivity(Qt::CaseInsensitive); diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp index 3b9d11c926..31ea702865 100644 --- a/plugins/qpa/integration.cpp +++ b/plugins/qpa/integration.cpp @@ -88,11 +88,7 @@ void Integration::initialize() ); QPlatformIntegration::initialize(); auto dummyScreen = new Screen(-1); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) QWindowSystemInterface::handleScreenAdded(dummyScreen); -#else - screenAdded(dummyScreen); -#endif m_screens << dummyScreen; m_inputContext.reset(QPlatformInputContextFactory::create(QStringLiteral("qtvirtualkeyboard"))); qunsetenv("QT_IM_MODULE"); @@ -182,28 +178,16 @@ void Integration::initScreens() newScreens.reserve(qMax(screens()->count(), 1)); for (int i = 0; i < screens()->count(); i++) { auto screen = new Screen(i); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) QWindowSystemInterface::handleScreenAdded(screen); -#else - screenAdded(screen); -#endif newScreens << screen; } if (newScreens.isEmpty()) { auto dummyScreen = new Screen(-1); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) QWindowSystemInterface::handleScreenAdded(dummyScreen); -#else - screenAdded(dummyScreen); -#endif newScreens << dummyScreen; } while (!m_screens.isEmpty()) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) QWindowSystemInterface::handleScreenRemoved(m_screens.takeLast()); -#else - destroyScreen(m_screens.takeLast()); -#endif } m_screens = newScreens; }