From d95442c77a34a5bb6adca56cd0daf224315f3dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=88=90=E5=88=9A?= Date: Mon, 26 Dec 2022 16:11:58 +0800 Subject: [PATCH] update: kf5 5.90 --- CMakeLists.txt | 13 +-- KF5ActivitiesConfig.cmake.in | 2 +- LICENSES/CC0-1.0.txt | 121 ++++++++++++++++++++++++++ autotests/core/CMakeLists.txt | 8 +- debian/changelog | 20 ++++- debian/control | 11 +-- debian/libkf5activities5.symbols | 6 +- src/cli/CMakeLists.txt | 6 +- src/imports/CMakeLists.txt | 16 ++-- src/imports/activityinfo.h | 2 +- src/imports/resourceinstance.h | 2 +- src/lib/CMakeLists.txt | 27 +++--- src/lib/activitiescache_p.h | 2 +- src/lib/consumer.h | 2 +- src/lib/controller.h | 2 +- src/lib/info.h | 2 +- src/lib/resourceinstance.cpp | 4 +- src/lib/resourceinstance.h | 2 +- src/utils/dbusfuture_p.h | 2 +- tests/activities-model/CMakeLists.txt | 11 ++- tests/activities-model/window.h | 2 +- 21 files changed, 198 insertions(+), 65 deletions(-) create mode 100644 LICENSES/CC0-1.0.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 21fae63..335d88d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.16) # KDE Frameworks -set(KF_VERSION "5.86.0") # handled by release scripts -set(KF_DEP_VERSION "5.86.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project (KActivities VERSION ${KF_VERSION}) option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF) @@ -24,7 +24,7 @@ set (KACTIVITIES_CURRENT_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) # Extra CMake stuff include(FeatureSummary) -find_package(ECM 5.86.0 NO_MODULE) +find_package(ECM 5.90.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -36,6 +36,7 @@ include(KDEGitCommitHooks) include (KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include (GenerateExportHeader) include (ECMGenerateHeaders) +include (ECMGeneratePkgConfigFile) include (ECMQtDeclareLoggingCategory) include (ECMAddQch) include (ECMMarkNonGuiExecutable) @@ -45,7 +46,7 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt # Qt set (CMAKE_AUTOMOC ON) -find_package (Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) +find_package (Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) # Basic includes include (CPack) @@ -73,7 +74,7 @@ ecm_setup_version ( ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_subdirectory (src) if (BUILD_TESTING) @@ -115,7 +116,7 @@ install ( install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/kactivities_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) # Write out the features diff --git a/KF5ActivitiesConfig.cmake.in b/KF5ActivitiesConfig.cmake.in index 25291c9..476726b 100644 --- a/KF5ActivitiesConfig.cmake.in +++ b/KF5ActivitiesConfig.cmake.in @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5ActivitiesLibraryTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/autotests/core/CMakeLists.txt b/autotests/core/CMakeLists.txt index 41b885a..c2a26dc 100644 --- a/autotests/core/CMakeLists.txt +++ b/autotests/core/CMakeLists.txt @@ -1,7 +1,7 @@ # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab: project (KActivitiesTest) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Test Core DBus) +find_package (Qt${QT_MAJOR_VERSION} REQUIRED NO_MODULE COMPONENTS Test Core DBus) include_directories ( ${KACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/ @@ -28,9 +28,9 @@ if (NOT WIN32) target_link_libraries ( KActivitiesTest - Qt5::Core - Qt5::Test - Qt5::DBus + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Test + Qt${QT_MAJOR_VERSION}::DBus KF5::Activities ) diff --git a/debian/changelog b/debian/changelog index 6e319cd..a369206 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,22 @@ -kactivities-kf5 (5.86.0.1-deepin1) unstable; urgency=medium +kactivities-kf5 (5.90.0-1) experimental; urgency=medium - * Fix build failure on deepin-riscv + [ Norbert Preining ] + * New upstream release (5.89.0). + + [ Aurélien COUDERC ] + * New upstream release (5.90.0). + * Added myself to the uploaders. + + -- Aurélien COUDERC Fri, 11 Feb 2022 23:46:42 +0100 + +kactivities-kf5 (5.88.0-1) unstable; urgency=medium + + [ Norbert Preining ] + * New upstream release (5.87.0). + * New upstream release (5.88.0). + * Force-bump frameworks internal b-d to 5.88. - -- Gui-Yue Thu, 08 Dec 2022 10:28:02 +0000 + -- Norbert Preining Wed, 17 Nov 2021 06:07:37 +0900 kactivities-kf5 (5.86.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 791518c..42e5cfe 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,16 @@ Source: kactivities-kf5 Section: libs Priority: optional Maintainer: Debian Qt/KDE Maintainers -Uploaders: Norbert Preining +Uploaders: Aurélien COUDERC , + Norbert Preining , Build-Depends: cmake (>= 3.16~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.86.0~), + extra-cmake-modules (>= 5.90.0~), libboost-dev (>= 1.49~), - libkf5config-dev (>= 5.86.0~), - libkf5coreaddons-dev (>= 5.86.0~), - libkf5windowsystem-dev (>= 5.86.0~), + libkf5config-dev (>= 5.90.0~), + libkf5coreaddons-dev (>= 5.90.0~), + libkf5windowsystem-dev (>= 5.90.0~), libqt5sql5-sqlite, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.15.2~), diff --git a/debian/libkf5activities5.symbols b/debian/libkf5activities5.symbols index 0b571a7..de75fdd 100644 --- a/debian/libkf5activities5.symbols +++ b/debian/libkf5activities5.symbols @@ -127,8 +127,8 @@ libKF5Activities.so.5 libkf5activities5 #MINVER# (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.44.0 (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0 (optional=gccinternal|arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 5.21.0 + (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 5.44.0 (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 5.21.0 - _ZTISt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 5.90.0-1 _ZTSN11KActivities10ControllerE@Base 4.96.0 _ZTSN11KActivities15ActivitiesModelE@Base 5.21.0 _ZTSN11KActivities16ResourceInstanceE@Base 4.96.0 @@ -140,13 +140,13 @@ libKF5Activities.so.5 libkf5activities5 #MINVER# (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 5.44.0 (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 4.98.0 _ZTSSt19_Sp_make_shared_tag@Base 5.21.0 + (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 5.44.0 (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 5.21.0 - _ZTSSt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 5.90.0-1 _ZTVN11KActivities10ControllerE@Base 4.96.0 _ZTVN11KActivities15ActivitiesModelE@Base 5.21.0 _ZTVN11KActivities16ResourceInstanceE@Base 4.96.0 _ZTVN11KActivities4InfoE@Base 4.96.0 _ZTVN11KActivities8ConsumerE@Base 4.96.0 + (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 5.44.0 (arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 5.21.0 - _ZTVSt23_Sp_counted_ptr_inplaceIN11KActivities4InfoESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 5.90.0-1 _ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 5.51.0 diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt index 308f06b..8296dcb 100644 --- a/src/cli/CMakeLists.txt +++ b/src/cli/CMakeLists.txt @@ -1,8 +1,8 @@ # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab: project (KActivitiesCLI) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) +find_package (Qt${QT_MAJOR_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) +find_package (Qt${QT_MAJOR_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) find_package (KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS WindowSystem) include_directories ( @@ -26,7 +26,7 @@ add_executable ( target_link_libraries ( kactivities-cli - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core KF5::Activities ) diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt index 3dc8c3d..274d918 100644 --- a/src/imports/CMakeLists.txt +++ b/src/imports/CMakeLists.txt @@ -1,10 +1,8 @@ # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab: project (kactivities-imports) -find_package (ECM 0.0.8 REQUIRED NO_MODULE) -set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Sql Gui Qml Quick Sql) +find_package (Qt${QT_MAJOR_VERSION} REQUIRED NO_MODULE COMPONENTS Gui Qml Quick Sql) find_package (KF5Config ${KF_DEP_VERSION} CONFIG REQUIRED) find_package (KF5CoreAddons ${KF_DEP_VERSION} CONFIG REQUIRED) @@ -23,12 +21,12 @@ add_library (kactivitiesextensionplugin SHARED ${kactivities_imports_LIB_SRCS}) target_link_libraries ( kactivitiesextensionplugin - Qt5::Core - Qt5::DBus - Qt5::Gui - Qt5::Qml - Qt5::Quick - Qt5::Sql + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::DBus + Qt${QT_MAJOR_VERSION}::Gui + Qt${QT_MAJOR_VERSION}::Qml + Qt${QT_MAJOR_VERSION}::Quick + Qt${QT_MAJOR_VERSION}::Sql KF5::Activities KF5::ConfigCore KF5::CoreAddons diff --git a/src/imports/activityinfo.h b/src/imports/activityinfo.h index 93bbbcf..ff4a919 100644 --- a/src/imports/activityinfo.h +++ b/src/imports/activityinfo.h @@ -56,7 +56,7 @@ class ActivityInfo : public QObject public: explicit ActivityInfo(QObject *parent = nullptr); - virtual ~ActivityInfo(); + ~ActivityInfo() override; public Q_SLOTS: void setActivityId(const QString &id); diff --git a/src/imports/resourceinstance.h b/src/imports/resourceinstance.h index c8491e8..bd59212 100644 --- a/src/imports/resourceinstance.h +++ b/src/imports/resourceinstance.h @@ -35,7 +35,7 @@ class ResourceInstance : public QQuickItem public: explicit ResourceInstance(QQuickItem *parent = nullptr); - ~ResourceInstance(); + ~ResourceInstance() override; QUrl uri() const; void setUri(const QUrl &uri); diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index bf2bdec..abb21e9 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -99,14 +99,14 @@ set_target_properties ( target_link_libraries ( KF5Activities PUBLIC - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core PRIVATE - Qt5::DBus + Qt${QT_MAJOR_VERSION}::DBus ) target_include_directories ( KF5Activities - INTERFACE "$" + INTERFACE "$" ) # install @@ -126,13 +126,13 @@ ecm_generate_headers ( ) install ( FILES ${KActivities_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KActivities/KActivities + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KActivities/KActivities COMPONENT Devel ) install ( FILES ${KActivities_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kactivities_export.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KActivities/kactivities + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KActivities/kactivities COMPONENT Devel ) @@ -168,21 +168,20 @@ endif() if (NOT WIN32) - configure_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/libKActivities.pc.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libKActivities.pc - ) - install ( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libKActivities.pc - DESTINATION ${KDE_INSTALL_LIBDIR}/pkgconfig - ) + ecm_generate_pkgconfig_file(BASE_NAME libKActivities + LIB_NAME KF5Activities + INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KActivities + DEPS Qt${QT_MAJOR_VERSION}Core + DESCRIPTION "libKActivities is a C++ library for using KDE activities" + INSTALL + ) endif () include (ECMGeneratePriFile) ecm_generate_pri_file ( BASE_NAME KActivities LIB_NAME KF5Activities - FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KActivities + FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KActivities ) install ( FILES ${PRI_FILENAME} diff --git a/src/lib/activitiescache_p.h b/src/lib/activitiescache_p.h index cb11016..d091f4c 100644 --- a/src/lib/activitiescache_p.h +++ b/src/lib/activitiescache_p.h @@ -26,7 +26,7 @@ class ActivitiesCache : public QObject public: static std::shared_ptr self(); - ~ActivitiesCache(); + ~ActivitiesCache() override; Q_SIGNALS: void activityAdded(const QString &id); diff --git a/src/lib/consumer.h b/src/lib/consumer.h index c1d577b..8268258 100644 --- a/src/lib/consumer.h +++ b/src/lib/consumer.h @@ -80,7 +80,7 @@ class KACTIVITIES_EXPORT Consumer : public QObject explicit Consumer(QObject *parent = nullptr); - ~Consumer(); + ~Consumer() override; /** * @returns the id of the current activity diff --git a/src/lib/controller.h b/src/lib/controller.h index ae6d11b..64d3527 100644 --- a/src/lib/controller.h +++ b/src/lib/controller.h @@ -41,7 +41,7 @@ class KACTIVITIES_EXPORT Controller : public Consumer public: explicit Controller(QObject *parent = nullptr); - ~Controller(); + ~Controller() override; /** * Sets the name of the specified activity diff --git a/src/lib/info.h b/src/lib/info.h index 00c2929..1638218 100644 --- a/src/lib/info.h +++ b/src/lib/info.h @@ -66,7 +66,7 @@ class KACTIVITIES_EXPORT Info : public QObject public: explicit Info(const QString &activity, QObject *parent = nullptr); - ~Info(); + ~Info() override; /** * @return true if the activity represented by this object exists and is valid diff --git a/src/lib/resourceinstance.cpp b/src/lib/resourceinstance.cpp index f0b0d13..f66a820 100644 --- a/src/lib/resourceinstance.cpp +++ b/src/lib/resourceinstance.cpp @@ -77,7 +77,7 @@ ResourceInstance::ResourceInstance(quintptr wid, QUrl resourceUri, const QString : QObject(parent) , d(new ResourceInstancePrivate()) { - qCDebug(KAMD_CORELIB) << "Creating ResourceInstance: " << resourceUri; + qCDebug(KAMD_CORELIB) << "Creating ResourceInstance:" << resourceUri; d->wid = wid; d->uri = resourceUri.adjusted(QUrl::StripTrailingSlash); d->application = application.isEmpty() ? QCoreApplication::instance()->applicationName() : application; @@ -136,7 +136,7 @@ void ResourceInstance::setMimetype(const QString &mimetype) void ResourceInstance::setTitle(const QString &title) { - qCDebug(KAMD_CORELIB) << "Setting the title: " << title; + qCDebug(KAMD_CORELIB) << "Setting the title:" << title; if (title.isEmpty()) { return; } diff --git a/src/lib/resourceinstance.h b/src/lib/resourceinstance.h index 9deb9e8..13b8d78 100644 --- a/src/lib/resourceinstance.h +++ b/src/lib/resourceinstance.h @@ -96,7 +96,7 @@ class KACTIVITIES_EXPORT ResourceInstance : public QObject * Destroys the ResourceInstance and notifies the system * that the resource has been closed */ - ~ResourceInstance(); + ~ResourceInstance() override; public Q_SLOTS: /** diff --git a/src/utils/dbusfuture_p.h b/src/utils/dbusfuture_p.h index 0c5c09f..a32d91c 100644 --- a/src/utils/dbusfuture_p.h +++ b/src/utils/dbusfuture_p.h @@ -32,7 +32,7 @@ class DBusCallFutureInterface : public QObject, public QFutureInterface<_Result> { } - ~DBusCallFutureInterface() + ~DBusCallFutureInterface() override { delete replyWatcher; } diff --git a/tests/activities-model/CMakeLists.txt b/tests/activities-model/CMakeLists.txt index d46427c..cded02a 100644 --- a/tests/activities-model/CMakeLists.txt +++ b/tests/activities-model/CMakeLists.txt @@ -1,8 +1,7 @@ # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab: project (KActivitiesModelTestApp) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) +find_package (Qt${QT_MAJOR_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) find_package (KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS WindowSystem) include_directories ( @@ -30,10 +29,10 @@ if (NOT WIN32) target_link_libraries ( KActivitiesModelTestApp - Qt5::Core - Qt5::Gui - Qt5::Widgets - Qt5::DBus + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Gui + Qt${QT_MAJOR_VERSION}::Widgets + Qt${QT_MAJOR_VERSION}::DBus KF5::Activities KF5::WindowSystem ) diff --git a/tests/activities-model/window.h b/tests/activities-model/window.h index 69ed703..10a9589 100644 --- a/tests/activities-model/window.h +++ b/tests/activities-model/window.h @@ -22,7 +22,7 @@ class Window : public QMainWindow public: Window(); - ~Window(); + ~Window() override; protected: void showEvent(QShowEvent *event) override;