From e7823a048493a1fbbcc93c5f71d4a39622eb6b55 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 28 Aug 2023 20:35:10 +0300 Subject: [PATCH] generic: require Katie v4.14.0+ Signed-off-by: Ivailo Monev --- CMakeLists.txt | 2 +- KDELibs4Config.cmake.in | 2 +- plasma/widgets/declarativewidget.cpp | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9903364e..c456ddc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ if(ENABLE_TESTING) endif() # required packages -find_package(Katie 4.13.0) +find_package(Katie 4.14.0) set_package_properties(Katie PROPERTIES DESCRIPTION "C++ toolkit derived from the Qt 4.8 framework" URL "https://bitbucket.org/smil3y/workspace/projects/KATANA" diff --git a/KDELibs4Config.cmake.in b/KDELibs4Config.cmake.in index 9fa6e6ee..4ae9cf8a 100644 --- a/KDELibs4Config.cmake.in +++ b/KDELibs4Config.cmake.in @@ -94,7 +94,7 @@ if(NOT KDELIBS4_FOUND) set(KDE4_DEFINITIONS "${KDE4_DEFINITIONS} -DNDEBUG") endif() - find_package(Katie QUIET REQUIRED 4.13.0) + find_package(Katie QUIET REQUIRED 4.14.0) find_package(X11 QUIET REQUIRED) # add the found KDE, Katie and X11 include directories to KDE4_INCLUDES, the diff --git a/plasma/widgets/declarativewidget.cpp b/plasma/widgets/declarativewidget.cpp index dfa8d95e..c5ba6bc3 100644 --- a/plasma/widgets/declarativewidget.cpp +++ b/plasma/widgets/declarativewidget.cpp @@ -121,11 +121,10 @@ void DeclarativeWidgetPrivate::scheduleExecutionEnd() if (component->isReady() || component->isError()) { finishExecute(); } else { -#if QT_VERSION < 0x041300 - QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), q, SLOT(finishExecute())); -#else - QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)), q, SLOT(finishExecute())); -#endif + QObject::connect( + component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)), + q, SLOT(finishExecute()) + ); } }