Merge branch '5.4'

CMakeLists.txt

@@ -4,7 +4,7 @@ project(kdevpython VERSION 5.4.40)
 # KDevplatform dependency version
 set(KDEVPLATFORM_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
-find_package (ECM "5.14.0" REQUIRED NO_MODULE)
+find_package (ECM "5.28.0" REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${kdevpython_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(KDECompilerSettings NO_POLICY_SCOPE)
@@ -17,10 +17,6 @@ include(ECMAddTests)
 include(ECMSetupVersion)
 include(ECMQtDeclareLoggingCategory)
 
-if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
-    # Avoids bogus warnings with CMake 3.10+
-    list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON")
-endif()
 if(POLICY CMP0071)
     # Avoids compat messages from CMake 3.10+, with Qt < 5.9.4
     # See https://bugreports.qt.io/browse/QTBUG-63442
@@ -58,9 +54,9 @@ endif()
 
 configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY)
 
-set(QT_MIN_VERSION "5.5.0")
+set(QT_MIN_VERSION "5.7.0")
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test)
-set(KF5_DEP_VERSION "5.15.0")
+set(KF5_DEP_VERSION "5.28.0")
 find_package(KF5 ${KF5_DEP_VERSION} REQUIRED
     I18n
     ThreadWeaver
@@ -69,6 +65,11 @@ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED
 find_package(KDevPlatform ${KDEVPLATFORM_VERSION} CONFIG REQUIRED)
 find_package(KDevelop ${KDEVPLATFORM_VERSION} REQUIRED)
 
+if(NOT CMAKE_VERSION VERSION_LESS "3.10.0" AND KF5_VERSION VERSION_LESS "5.42.0")
+    # Avoids bogus warnings with CMake 3.10+, KF5.42+ has workaround
+    list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON")
+endif()
+
 if ( NOT WIN32 )
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wfatal-errors -Wall")
 endif ( NOT WIN32 )
@@ -144,10 +145,16 @@ install(FILES codestyle.py DESTINATION ${KDE_INSTALL_DATADIR}/kdevpythonsupport)
 install(FILES org.kde.kdev-python.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 # kdebugsettings file
+# kdebugsettings >= 18.12 supports/pushes for some newer, not backward-compatible format.
+# For ECM >= 5.59 we install categories files to new location, which is only supported by
+# newer kdebugsettings also supporting the new content format, so we use that as base.
 if (ECM_VERSION VERSION_GREATER "5.58.0")
-    install(FILES kdevpythonsupport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+    install(FILES kdevpythonsupport-newformat.categories RENAME kdevpythonsupport.categories
+        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+    )
 else()
-    install(FILES kdevpythonsupport.categories DESTINATION ${KDE_INSTALL_CONFDIR})
+    install(FILES kdevpythonsupport-oldformat.categories RENAME kdevpythonsupport.categories
+        DESTINATION ${KDE_INSTALL_CONFDIR})
 endif()
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

codecompletion/tests/pycompletiontest.cpp

@@ -44,9 +44,6 @@ using namespace KDevelop;
 QTEST_MAIN(Python::PyCompletionTest)
 
 Q_DECLARE_METATYPE(QList<Python::RangeInString>)
-#if KTEXTEDITOR_VERSION < QT_VERSION_CHECK(5, 10, 0)
-Q_DECLARE_METATYPE(KTextEditor::Range)
-#endif
 
 static int testId = 0;
 static QString basepath = "/tmp/__kdevpythoncompletiontest.dir/";

kdevpythonsupport-newformat.categories

+# KDebugSettings data file
+# Format:
+# logname<space>description(optional <space> DEFAULT_SEVERITY [DEFAULT_CATEGORY] as WARNING/DEBUG/INFO/CRITICAL) optional IDENTIFIER [...])
+
+kdevelop.plugins.python KDevelop plugin: Python language support IDENTIFIER [KDEV_PYTHON]
+kdevelop.plugins.python.codecompletion KDevelop plugin: Python language support - codecompletion IDENTIFIER [KDEV_PYTHON_CODECOMPLETION]
+kdevelop.plugins.python.codegen KDevelop plugin: Python language support - codegen  IDENTIFIER [KDEV_PYTHON_CODEGEN]
+kdevelop.plugins.python.debugger KDevelop plugin: Python language support - debugger IDENTIFIER [KDEV_PYTHON_DEBUGGER]
+kdevelop.plugins.python.duchain KDevelop plugin: Python language support - duchain IDENTIFIER [KDEV_PYTHON_DUCHAIN]
+kdevelop.plugins.python.parser KDevelop plugin: Python language support - parser IDENTIFIER [KDEV_PYTHON_PARSER]

org.kde.kdev-python.metainfo.xml

@@ -16,8 +16,8 @@
   <name xml:lang="nl">Python ondersteuning in KDevelop</name>
   <name xml:lang="pl">Obsługa Pythona w KDevelop</name>
   <name xml:lang="pt">Suporte para Python do KDevelop</name>
-  <name xml:lang="pt-BR">Suporte à Python do KDevelop</name>
-  <name xml:lang="sl">Podpora Pythonu za KDevelop</name>
+  <name xml:lang="pt-BR">Suporte a Python no KDevelop</name>
+  <name xml:lang="sk">Podpora jazyka Python pre KDevelop</name>
   <name xml:lang="sv">KDevelop Python-stöd</name>
   <name xml:lang="uk">Підтримка Python у KDevelop</name>
   <name xml:lang="x-test">xxKDevelop Python Supportxx</name>
@@ -37,9 +37,8 @@
   <summary xml:lang="nl">Ondersteuning voor de taal Python voor KDevelop</summary>
   <summary xml:lang="pl">Obsługa języka Python dla KDevelop</summary>
   <summary xml:lang="pt">Suporte para a linguagem Python no KDevelop</summary>
-  <summary xml:lang="pt-BR">Suporta à linguagem Python para o KDevelop</summary>
+  <summary xml:lang="pt-BR">Suporte ao Python para o KDevelop</summary>
   <summary xml:lang="sk">Podpora jazyka Python pre KDevelop</summary>
-  <summary xml:lang="sl">Podpora jeziku Python za KDevelop</summary>
   <summary xml:lang="sv">Stöd för språket Python i KDevelop</summary>
   <summary xml:lang="tr">KDevelop için Python dil desteği</summary>
   <summary xml:lang="uk">Підтримка мови Python у KDevelop</summary>
@@ -63,7 +62,6 @@
   <developer_name xml:lang="pt">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
   <developer_name xml:lang="pt-BR">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
   <developer_name xml:lang="sk">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
-  <developer_name xml:lang="sl">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
   <developer_name xml:lang="sv">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
   <developer_name xml:lang="tr">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
   <developer_name xml:lang="uk">Sven Brauch &lt;mail@svenbrauch.de&gt;</developer_name>
@@ -77,9 +75,10 @@
   <url type="help">https://docs.kde.org/index.php?application=kdevelop</url>
   <url type="donation">https://www.kde.org/community/donations/?app=kdevelop</url>
   <project_group>KDE</project_group>
-  <update_contact>mail@svenbrauch.de</update_contact>
+  <icon type="stock">kdevelop</icon>
   <categories>
     <category>Development</category>
+    <category>IDE</category>
   </categories>
-  <icon type="stock">kdevelop</icon>
+  <update_contact>mail@svenbrauch.de</update_contact>
 </component>

parser/tests/pyasttest.cpp

@@ -47,10 +47,6 @@
 
 using namespace Python;
 
-#if KTEXTEDITOR_VERSION < QT_VERSION_CHECK(5, 10, 0)
-Q_DECLARE_METATYPE(KTextEditor::Range)
-#endif
-
 QTEST_MAIN(PyAstTest)
 
 PyAstTest::PyAstTest(QObject* parent): QObject(parent)

parser/tests/pycythontest.cpp

@@ -39,10 +39,6 @@
 
 using namespace Python;
 
-#if KTEXTEDITOR_VERSION < QT_VERSION_CHECK(5, 10, 0)
-Q_DECLARE_METATYPE(KTextEditor::Range)
-#endif
-
 QTEST_MAIN(PyCythonTest)
 
 PyCythonTest::PyCythonTest(QObject* parent): QObject(parent)