Branches: Difference between revisions
Jump to navigation
Jump to search
(mess with branch naming) |
(Link to QUIP 5, as it's relevant.) |
||
Line 6: | Line 6: | ||
= Qt 5 = | = Qt 5 = | ||
For the policy and advice on choosing a branch to submit a change to, see {{QUIP|5}}. | |||
== Mainline branches == | == Mainline branches == |
Revision as of 12:42, 24 March 2017
All branches listed below reside in Gerrit on http://codereview.qt.io and are publicly available.
- Anonymous checkout:
$ git clone http://code.qt.io/<project>/<repo>
- SSH (push to Gerrit): please check Setting up Gerrit.
Qt 5
For the policy and advice on choosing a branch to submit a change to, see QUIP 5.
Mainline branches
- dev
- on-going development – new features go here.
- stabilizing
- branch receiving bug-fixes for next minor release (none as of December 2016).
- stable
- stabilized branch still receiving bug-fixes (5.8 as of December 2016).
- release
- receiving release-critical bug-fixes (5.8.0 as of December 2016).
- LTS
- Long-Term Support, 5.6 (until about 2020), only taking critical fixes.
- LTS/release
- receiving LTS release-critical bug-fixes (none as of December 2016).
All managed in accord with the Branch Guidelines.
Other branches
- Used for research or development of complex features.
- Feature branch names should be prefixed with wip/. Exceptions are historical.
- Feature branches often have relaxed review and integration policies and may be subject to occasional rebasing.
The following branch list applies to qt/qtbase unless otherwise noted.
- wip/lite
- Qt Lite, a project to make it possible at configure-time to opt out of parts of the tool-kit that a particular delivery doesn't need (thereby saving space on bitty little devices).
- wip/network-test-server
- Development of a containerised local implementation of the server used by qtbase's network tests. Uses a vagrant container. (Inactive since 2015/Oct; but network team does hope to find time to revive it.)
- wip/nacl
- Present in qtbase, qtdeclarative. A Qt port for the Google (portable) Native Client, and emscripten.
- wip/qbs
- A new Qt Build System.
- winrt
- (misnomer, should be wip/winrt) Present in qtbase, qttools.
- Used for development of Qt's Windows Runtime port (see http://blog.qt.io/blog/2013/02/15/port-to-windows-runtime-kick-started/ and http://blog.qt.io/blog/2013/04/19/qts-winrt-port-and-its-ccx-usage/ for some background information). Gerrit is enabled for this branch but it is not CI checked. Be aware, that this branch is rebased regularly (force pushes involved). If you want to get in contact/help out, join #qt-winrt on freenode.
- wip/mir
- Development history for src/plugins/platforms/mirclient/. Fully merged into Qt 5.6 by https://codereview.qt-project.org/#/c/122984
- No longer active, but Canonical have said (2016-08-22, on developer list):
- We're iterating the code in our repository (lp:qtmir) but plan to update this wip branch once we're happy with the features and apis
Dead branches
- wip/highdpi
- High-DPI research for Qt 5.6. No longer in use (last commit: 2015/Jul).
- wip/tizen
- Present in qtbase, qtdeclarative, qtsensors and qtquickcontrols.
- Branch abandoned (RIP 2015/Feb); apparently for want of enthusiastic developers.
- Relates to support for Tizen, a GNU/Linux operating system for low-end devices. See: http://qtfortizen.blogspot.co.uk/
- wip/qstring-utf8
- Dead branch, merged long ago (c. 2012/May). Was used to convert the QString functions that take const char* from Latin1 to UTF-8.
Qt 4
Mainline branches
The 4.8 branch follows the Branch Guidelines.
Other branches
- 4.8-bb10
- This branch contains a recent version of the 4.8 branch plus additional backported patches that are used for BlackBerry 10 and are not backported to the 4.8 branch. The 4.8-bb10 branch was subject to rebasing.
Qt Creator
See Submit-Policies for Qt Creator's branching policy.
wip/vcproj
Branch used to develop a plugin that enables people to work with Visual Studio projects in Qt Creator. Currently it can only open projects with a .vcproj extension.
- At the moment plugin supports:
- editing of project's properties (this feature waits for a code review on Gerrit)
- adding/removing files, filters and folders to/from a project (also waits for a code review on Gerrit).
- building a Visual Studio (.vcproj) project
- How to set up