Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
b03a6ed0
Commit
b03a6ed0
authored
May 10, 2020
by
Simon Eugster
Browse files
Docs: Describe branching model and release cycle, add links to KF5 and Qt5
parent
78d0ce91
Changes
2
Hide whitespace changes
Inline
Side-by-side
dev-docs/coding.md
View file @
b03a6ed0
# Coding and Resources
*
[
All Qt5 classes
][
qt5c
]
*
Qt5
*
[
All Qt5 classes
][
qt5c
]
*
[
Signals and Slots
][
qt-sig
]
*
[
MLT introduction
][
mlt-intro
]
.
*
[
The KDE Frameworks
][
kf
]
## Configuration
...
...
@@ -28,3 +31,5 @@ KdenliveSettings::setLogscale(true);
[
sett
]:
../src/kdenlivesettings.kcfg
[
mlt-intro
]:
https://www.mltframework.org/docs/framework/
[
qt5c
]:
https://doc.qt.io/qt-5/classes.html
[
qt-sig
]:
https://doc.qt.io/qt-5/signalsandslots.html
[
kf
]:
https://api.kde.org/frameworks-api/frameworks-apidocs/frameworks/index.html
dev-docs/contributing.md
View file @
b03a6ed0
...
...
@@ -4,8 +4,32 @@
*
Get it reviewed
*
Join the Telegram group
## Coding Guidelines
*
Use existing code style
*
Write unit tests
*
Document unclear parts (e.g. what a QMutex is locking)
## Release + Branching Model
Kdenlive is following the
[
KDE Release Schedule
][
sched
]
and a new major version
like
`20.04`
is released every four months. Bugfix releases like
`20.04.1`
are
released until the next major release arrives.
The branching model in Git works as follows:
*
`master`
is the most recent development version.
*
`release/*`
contains release branches like
`release/20.04`
. Shortly before a
new major version is released, the new release branch is created and we enter
feature and string freeze for final bugfixes and translation of texts. The
version which is effectively released is marked with a tag.
*
`feature/*`
contains feature branches. When you start coding a new feature,
do it on a feature branch. When it is ready, the feature branch is merged
back into master if the merge request has been approved.
Bugfixes for the released versions are added on the release branch and then
merged back to master.
[
sched
]:
https://community.kde.org/Schedules
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