Merge pull request #1 from Gui-Yue/topic-kde-relate

feat:upgrade to 5.103

CMakeLists.txt

@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "5.90.0") # handled by release scripts
-set(KF_DEP_VERSION "5.90.0") # handled by release scripts
+set(KF_VERSION "5.103.0") # handled by release scripts
+set(KF_DEP_VERSION "5.103.0") # handled by release scripts
 project(KTextWidgets VERSION ${KF_VERSION})
 
 # ECM setup
 include(FeatureSummary)
-find_package(ECM 5.90.0  NO_MODULE)
+find_package(ECM 5.103.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)
 
@@ -22,6 +22,8 @@ include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(ECMAddQch)
+include(ECMDeprecationSettings)
+include(CMakeDependentOption)
 
 ecm_setup_version(PROJECT
                   VARIABLE_PREFIX KTEXTWIDGETS
@@ -56,12 +58,16 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprec
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
 
-option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
 add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
 
 add_definitions(-DTRANSLATION_DOMAIN=\"ktextwidgets5\")
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900)
+
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+    KF 5.95
+)
+
 ki18n_install(po)
 add_subdirectory(src)
 if (BUILD_TESTING)
@@ -96,7 +102,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5TextWidgetsConfig.cmake"
        )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ktextwidgets_version.h
-        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel
+        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KTextWidgets COMPONENT Devel
        )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

autotests/kreplacetest.cpp

@@ -93,7 +93,10 @@ void KReplaceTest::slotHighlight(const QString &str, int matchingIndex, int matc
         dlg->hide();
 
         QPushButton *button = dlg->findChild<QPushButton *>(m_buttonName);
-        QMetaObject::invokeMethod(button, "click", Qt::QueuedConnection);
+        auto clickFunc = [button]() {
+            button->click();
+        };
+        QMetaObject::invokeMethod(button, clickFunc, Qt::QueuedConnection);
 
         m_needEventLoop = true;
     }

autotests/krichtextedittest.cpp

@@ -126,14 +126,20 @@ void KRichTextEditTest::testHTMLLineBreaks()
     const QStringList lines = html.split(QLatin1Char('\n'));
 
     //  for (int idx=0; idx<lines.size(); idx++) {
-    //    qDebug() << ( idx + 1 ) << QString( " : " ) << lines.at( idx );
+    //    qDebug() << ( idx + 1 ) << " : " << lines.at( idx );
     //  }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
     QVERIFY2(lines.size() == 7,
              "we can't perform this unit test: "
              "the html rendering has changed beyond recognition");
+#elif QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
+    QCOMPARE(lines.size(), 8);
+#else
+    QCOMPARE(lines.size(), 10);
+#endif
 
-    const QString &line6 = lines.at(5);
+    const QString &line6 = lines.at(lines.size() - 2);
 
     // make sure that this is an empty <p> line
     QVERIFY(line6.startsWith(QStringLiteral("<p style=\"-qt-paragraph-type:empty;")));
@@ -169,15 +175,21 @@ void KRichTextEditTest::testHTMLOrderedLists()
     //  rendering has actually introduced a bug, or merely a problem with the unit test itself
     //
     //  for (int idx=0; idx<lines.size(); idx++) {
-    //    qDebug() << ( idx + 1 ) << QString( " : " ) << lines.at( idx );
+    //    qDebug() << ( idx + 1 ) << " : " << lines.at( idx );
     //  }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
     QVERIFY2(lines.size() == 9,
              "we can't perform this unit test: "
              "the html rendering has changed beyond recognition");
+#elif QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
+    QCOMPARE(lines.size(), 10);
+#else
+    QCOMPARE(lines.size(), 13);
+#endif
 
     // this is the <ol> declaration line
-    const QString &line6 = lines.at(5);
+    const QString &line6 = lines.at(lines.size() - 4);
 
     //  qDebug() << line6;
 
@@ -213,15 +225,21 @@ void KRichTextEditTest::testHTMLUnorderedLists()
     //  rendering has actually introduced a bug, or merely a problem with the unit test itself
     //
     //  for (int idx=0; idx<lines.size(); idx++) {
-    //    qDebug() << ( idx + 1 ) << QString( " : " ) << lines.at( idx );
+    //    qDebug() << ( idx + 1 ) << " : " << lines.at( idx );
     //  }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
     QVERIFY2(lines.size() == 9,
              "we can't perform this unit test: "
              "the html rendering has changed beyond recognition");
+#elif QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
+    QCOMPARE(lines.size(), 10);
+#else
+    QCOMPARE(lines.size(), 13);
+#endif
 
     // this is the <ol> declaration line
-    const QString &line6 = lines.at(5);
+    const QString &line6 = lines.at(lines.size() - 4);
 
     //  qDebug() << line6;
 

debian/changelog

@@ -1,10 +1,77 @@
-ktextwidgets (5.90.0-1) UNRELEASED; urgency=medium
+ktextwidgets (5.103.0-1) unstable; urgency=medium
 
-  * update
+  [ Aurélien COUDERC ]
+  * New upstream release (5.103.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 12 Feb 2023 21:44:30 +0100
+
+ktextwidgets (5.102.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.102.0).
+  * Update build-deps and deps with the info from cmake.
+  * Bump Standards-Version to 4.6.2, no change required.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 22 Jan 2023 21:35:08 +0100
+
+ktextwidgets (5.101.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.101.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Tue, 13 Dec 2022 07:40:33 +0100
+
+ktextwidgets (5.100.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.99.0).
+  * Update build-deps and deps with the info from cmake.
+  * New upstream release (5.100.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sat, 19 Nov 2022 23:19:04 +0100
+
+ktextwidgets (5.98.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.98.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 18 Sep 2022 23:11:47 +0200
+
+ktextwidgets (5.97.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.97.0).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 14 Aug 2022 18:55:38 +0200
+
+ktextwidgets (5.96.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.96.0).
+  * Bump Standards-Version to 4.6.1, no change required.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 31 Jul 2022 13:33:07 +0200
+
+ktextwidgets (5.94.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.94.0).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 19 May 2022 23:59:06 +0200
+
+ktextwidgets (5.93.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.93.0).
+  * Update the list of installed files from build logs.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 24 Apr 2022 17:41:45 +0800
+ -- Aurélien COUDERC <coucouf@debian.org>  Wed, 11 May 2022 23:22:47 +0200
 
-ktextwidgets (5.90.0-1) experimental; urgency=medium
+ktextwidgets (5.90.0-1) unstable; urgency=medium
 
   [ Norbert Preining ]
   * New upstream release (5.89.0).

debian/control

@@ -7,13 +7,13 @@ Uploaders: Aurélien COUDERC <coucouf@debian.org>,
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
                doxygen,
-               extra-cmake-modules (>= 5.90.0~),
-               libkf5completion-dev (>= 5.90.0~),
-               libkf5config-dev (>= 5.90.0~),
-               libkf5configwidgets-dev (>= 5.90.0~),
-               libkf5i18n-dev (>= 5.90.0~),
-               libkf5sonnet-dev (>= 5.90.0~),
-               libkf5widgetsaddons-dev (>= 5.90.0~),
+               extra-cmake-modules (>= 5.103.0~),
+               libkf5completion-dev (>= 5.103.0~),
+               libkf5config-dev (>= 5.103.0~),
+               libkf5configwidgets-dev (>= 5.103.0~),
+               libkf5i18n-dev (>= 5.103.0~),
+               libkf5sonnet-dev (>= 5.103.0~),
+               libkf5widgetsaddons-dev (>= 5.103.0~),
                libqt5sql5-sqlite,
                libqt5texttospeech5-dev,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
@@ -22,7 +22,7 @@ Build-Depends: cmake (>= 3.16~),
                qttools5-dev-tools (>= 5.4),
                xauth,
                xvfb,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Homepage: https://invent.kde.org/frameworks/ktextwidgets
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/ktextwidgets
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/ktextwidgets.git
@@ -31,9 +31,9 @@ Rules-Requires-Root: no
 Package: libkf5textwidgets-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: libkf5textwidgets5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1)
-Replaces: libkf5textwidgets5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1)
+Depends: ${misc:Depends},
+Breaks: libkf5textwidgets5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1),
+Replaces: libkf5textwidgets5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa1),
 Description: Advanced text editing widgets.
  An assortment of text-related widgets
  .
@@ -42,14 +42,14 @@ Description: Advanced text editing widgets.
 Package: libkf5textwidgets-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5completion-dev (>= 5.90.0~),
-         libkf5configwidgets-dev (>= 5.90.0~),
-         libkf5sonnet-dev (>= 5.90.0~),
+Depends: libkf5completion-dev (>= 5.103.0~),
+         libkf5configwidgets-dev (>= 5.103.0~),
+         libkf5sonnet-dev (>= 5.103.0~),
          libkf5textwidgets5 (= ${binary:Version}),
          qtbase5-dev (>= 5.15.2~),
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: libkf5textwidgets-doc (= ${source:Version})
+Recommends: libkf5textwidgets-doc (= ${source:Version}),
 Description: development files for ktextwidgets
  An assortment of text-related widgets.
  .
@@ -61,7 +61,7 @@ Breaks: libkf5kdelibs4support-dev (<< 5.54),
 Package: libkf5textwidgets-doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: Advanced text editing widgets (documentation)
  An assortment of text-related widgets
  .

debian/libkf5textwidgets-dev.install

@@ -1,5 +1,4 @@
 usr/include/KF5/KTextWidgets/
-usr/include/KF5/ktextwidgets_version.h
 usr/lib/*/cmake/KF5TextWidgets/
 usr/lib/*/libKF5TextWidgets.so
 usr/lib/*/qt5/mkspecs/modules/qt_KTextWidgets.pri

metainfo.yaml

@@ -7,6 +7,7 @@ platforms:
     - name: FreeBSD
     - name: Windows
     - name: macOS
+    - name: Android
 portingAid: false
 deprecated: false
 release: true