Commit ab6ddf07 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch '5.4'

parents e6135037 977a688a
......@@ -392,7 +392,7 @@ int main( int argc, char *argv[] )
KAboutData aboutData( QStringLiteral("kdevelop"), i18n("KDevelop"), QStringLiteral(KDEVELOP_VERSION_STRING),
i18n("The KDevelop Integrated Development Environment"),
KAboutLicense::GPL,
i18n("Copyright 1999-%1, The KDevelop developers", QStringLiteral("2019")),
i18n("Copyright 1999-%1, The KDevelop developers", QStringLiteral("2020")),
QString(), QStringLiteral("https://www.kdevelop.org/"));
aboutData.setDesktopFileName(QStringLiteral("org.kde.kdevelop"));
aboutData.addAuthor( i18n("Kevin Funk"), i18n( "Co-maintainer, C++/Clang, QA, Windows Support" ), QStringLiteral("kfunk@kde.org") );
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e78beb2e..9963e353 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,9 +52,7 @@ function(generate_binary_resource target outfile)
${RESOURCES_WORKING_DIR}/.gitignore
${RESOURCES_WORKING_DIR}/CMakeLists.txt
COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc
- COMMAND ${CMAKE_COMMAND} -E env
- $<IF:$<BOOL:${MSVC}>,PATH,LD_LIBRARY_PATH>=$<TARGET_FILE_DIR:Qt5::Core>
- $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
+ COMMAND $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
WORKING_DIRECTORY ${RESOURCES_WORKING_DIR}
DEPENDS breeze-${target}-mkdir
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e2829c83..c10f1c831 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION}
)
# Qt 5.13 deprecated QComboBox::currentIndexChanged(QString) and Qt 5.14 undid that...
-if (Qt5Widgets_VERSION VERSION_GREATER_EQUAL 5.14.0)
+if (NOT Qt5Widgets_VERSION VERSION_LESS 5.14.0)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
endif()
......@@ -27,9 +27,9 @@ fi
if [ -z "$KDEV_PG_QT_VERSION" ]; then
KDEV_PG_QT_VERSION=v2.2.0
fi
KF5_VERSION=v5.64.0
PLASMA_VERSION=v5.17.3
KDE_APPLICATIONS_VERSION=v19.08.3
KF5_VERSION=v5.65.0
PLASMA_VERSION=v5.17.4
KDE_RELEASESERVICE_VERSION=v19.12.0
GRANTLEE_VERSION=v5.1.0
OKTETA_VERSION=v0.26.2
......@@ -191,7 +191,7 @@ build_framework kcmutils
(PATCH_FILE=$SCRIPT_DIR/knotifications_no_phonon.patch build_framework knotifications)
build_framework knotifyconfig
build_framework kdoctools
(PATCH_FILE=$SCRIPT_DIR/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch build_framework breeze-icons -DBINARY_ICONS_RESOURCE=1)
build_framework breeze-icons -DBINARY_ICONS_RESOURCE=1
build_framework kpty
build_framework kinit
fi
......@@ -202,9 +202,9 @@ build_project kdecoration $PLASMA_VERSION # needed by breeze
build_project breeze $PLASMA_VERSION
# KDE Applications
build_project libkomparediff2 $KDE_APPLICATIONS_VERSION
build_project kate $KDE_APPLICATIONS_VERSION -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_addons=TRUE -DBUILD_snippets=TRUE -DBUILD_kate-ctags=TRUE # for snippet plugin, see T3826
build_project konsole $KDE_APPLICATIONS_VERSION
build_project libkomparediff2 $KDE_RELEASESERVICE_VERSION
(PATCH_FILE=$SCRIPT_DIR/kate-unbreak-cmake3.5.patch build_project kate $KDE_RELEASESERVICE_VERSION -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_addons=TRUE -DBUILD_snippets=TRUE -DBUILD_kate-ctags=TRUE)
build_project konsole $KDE_RELEASESERVICE_VERSION
build_project okteta $OKTETA_VERSION -DBUILD_DESIGNERPLUGIN=OFF -DBUILD_OKTETAKASTENLIBS=OFF
# Extra
......
......@@ -95,7 +95,7 @@ KAboutData createAboutData()
i18n("KDevelop Platform"), QStringLiteral(KDEVPLATFORM_VERSION_STRING),
i18n("Development Platform for IDE-like Applications"),
KAboutLicense::LGPL_V2,
i18n("Copyright 2004-%1, The KDevelop developers", QStringLiteral("2019")),
i18n("Copyright 2004-%1, The KDevelop developers", QStringLiteral("2020")),
QString(), QStringLiteral("https://www.kdevelop.org/"));
aboutData.addAuthor( i18n("Andreas Pakulat"), i18n( "Architecture, VCS Support, Project Management Support, QMake Projectmanager" ), QStringLiteral("apaku@gmx.de") );
......
......@@ -146,5 +146,8 @@
<category>Development</category>
<category>IDE</category>
</categories>
<releases>
<release version="5.4.6" date="2020-01-06"/>
</releases>
<update_contact>kfunk@kde.org</update_contact>
</component>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment