Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdevelop
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Friedrich W. H. Kossebau
kdevelop
Commits
ab6ddf07
Commit
ab6ddf07
authored
Jan 06, 2020
by
Friedrich W. H. Kossebau
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '5.4'
parents
e6135037
977a688a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
24 deletions
+25
-24
app/main.cpp
app/main.cpp
+1
-1
appimage/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch
...age/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch
+0
-15
appimage/kate-unbreak-cmake3.5.patch
appimage/kate-unbreak-cmake3.5.patch
+13
-0
appimage/kdevelop-recipe-centos6.sh
appimage/kdevelop-recipe-centos6.sh
+7
-7
kdevplatform/shell/core.cpp
kdevplatform/shell/core.cpp
+1
-1
org.kde.kdevelop.appdata.xml
org.kde.kdevelop.appdata.xml
+3
-0
No files found.
app/main.cpp
View file @
ab6ddf07
...
...
@@ -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
(
"20
19
"
)),
i18n
(
"Copyright 1999-%1, The KDevelop developers"
,
QStringLiteral
(
"20
20
"
)),
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"
)
);
...
...
appimage/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch
deleted
100644 → 0
View file @
e6135037
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
appimage/kate-unbreak-cmake3.5.patch
0 → 100644
View file @
ab6ddf07
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()
appimage/kdevelop-recipe-centos6.sh
View file @
ab6ddf07
...
...
@@ -27,9 +27,9 @@ fi
if
[
-z
"
$KDEV_PG_QT_VERSION
"
]
;
then
KDEV_PG_QT_VERSION
=
v2.2.0
fi
KF5_VERSION
=
v5.6
4
.0
PLASMA_VERSION
=
v5.17.
3
KDE_
APPLICATIONS_VERSION
=
v19.08.3
KF5_VERSION
=
v5.6
5
.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
...
...
kdevplatform/shell/core.cpp
View file @
ab6ddf07
...
...
@@ -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
(
"20
19
"
)),
i18n
(
"Copyright 2004-%1, The KDevelop developers"
,
QStringLiteral
(
"20
20
"
)),
QString
(),
QStringLiteral
(
"https://www.kdevelop.org/"
));
aboutData
.
addAuthor
(
i18n
(
"Andreas Pakulat"
),
i18n
(
"Architecture, VCS Support, Project Management Support, QMake Projectmanager"
),
QStringLiteral
(
"apaku@gmx.de"
)
);
...
...
org.kde.kdevelop.appdata.xml
View file @
ab6ddf07
...
...
@@ -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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment