Qt wiki will be updated on October 12th 2023 starting at 11:30 AM (EEST) and the maintenance will last around 2-3 hours. During the maintenance the site will be unavailable.
Branches: Difference between revisions
Jump to navigation
Jump to search
(Change category. The creator-branch material has moved to a separate creator-specific page.) |
(This isn't so much guideline as list of what's what. Reworked wiki formatting.) |
||
| Line 1: | Line 1: | ||
[[Category:Developing Qt | [[Category:Developing Qt]] | ||
All branches listed below reside in Gerrit on http://codereview.qt.io and are publicly available. | All branches listed below reside in Gerrit on http://codereview.qt.io and are publicly available. | ||
* Anonymous checkout: <code>$ git clone http://code.qt.io/<project>/<repo></code> | * Anonymous checkout: <code>$ git clone http://code.qt.io/<project>/<repo></code> | ||
* SSH (push to Gerrit): please check [[Setting up Gerrit]]. | * SSH (push to Gerrit): please check [[Setting up Gerrit]]. | ||
| Line 10: | Line 9: | ||
== Mainline branches == | == Mainline branches == | ||
dev | ;dev: on-going development – new features go here. | ||
;release: preparing for release (5.8 in 2016 September). | |||
;stable: stabilised branch getting bug-fixes (5.7 in 2016 September). | |||
;LTS: Long-Term Support, 5.6 (until about 2020), only taking critical fixes. | |||
All managed in accord with the [[Branch Guidelines]]. | |||
== Other branches == | == Other branches == | ||
Used for research or development of complex features. | * Used for research or development of complex features. | ||
Feature branch names should be prefixed with wip/. Exceptions are historical. | * 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. | * 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. | The following branch list applies to qt/qtbase unless otherwise noted. | ||
;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. | |||
;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. | |||
Dead branch, merged long ago (c. 2012/May) | ; wip/tizen: Present in qtbase, qtdeclarative, qtsensors and qtquickcontrols. | ||
: Branch abandoned (RIP 2015/Feb); apparently for want of enthusiastic developers. | |||
: Relates to support for [https://en.wikipedia.org/wiki/Tizen Tizen], a GNU/Linux operating system for low-end devices. See: http://qtfortizen.blogspot.co.uk/ | |||
; 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/highdpi: High-DPI research for Qt 5.6. No longer in use (last commit: 2015/Jul). | |||
Present in qtbase, qttools. | ; 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). | ||
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 | ||
Present in qtbase, qtdeclarative, qtsensors and qtquickcontrols. | |||
Branch abandoned (RIP 2015/Feb); apparently for want of enthusiastic developers. | |||
Relates to support for [https://en.wikipedia.org/wiki/Tizen Tizen], a GNU/Linux operating system for low-end devices. | |||
See: http://qtfortizen.blogspot.co.uk/ | |||
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.) | |||
High-DPI research for Qt 5.6. | |||
No longer in use (last commit: 2015/Jul). | |||
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). | |||
Development history for ''src/plugins/platforms/mirclient/''. Fully merged into Qt 5.6 by | |||
https://codereview.qt-project.org/#/c/122984 | https://codereview.qt-project.org/#/c/122984 | ||
: No longer active, but Canonical have said (2016-08-22, on developer list): | |||
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 | ||
: 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 | ; wip/nacl: Present in qtbase, qtdeclarative. A Qt port fort Google (portable) Native Client, and emscripten. | ||
; wip/qbs: A new Qt Build System. | |||
Present in qtbase, qtdeclarative. | |||
A Qt port fort Google (portable) Native Client, and emscripten. | |||
A new Qt Build System. | |||
= Qt 4 = | = Qt 4 = | ||
| Line 77: | Line 46: | ||
== Other branches == | == 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. | |||
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 | |||
= Qt Creator = | = Qt Creator = | ||
| Line 87: | Line 54: | ||
=== wip/vcproj === | === 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. | 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 <kbd>.vcproj</kbd> extension. | ||
* At the moment plugin supports: | * At the moment plugin supports: | ||
** editing of project's properties (this feature waits for a code review on Gerrit) | ** editing of project's properties (this feature waits for a code review on Gerrit) | ||
Revision as of 13:31, 21 September 2016
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
Mainline branches
- dev
- on-going development – new features go here.
- release
- preparing for release (5.8 in 2016 September).
- stable
- stabilised branch getting bug-fixes (5.7 in 2016 September).
- LTS
- Long-Term Support, 5.6 (until about 2020), only taking critical fixes.
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/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.
- 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/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/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/highdpi
- High-DPI research for Qt 5.6. No longer in use (last commit: 2015/Jul).
- 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/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
- wip/nacl
- Present in qtbase, qtdeclarative. A Qt port fort Google (portable) Native Client, and emscripten.
- wip/qbs
- A new Qt Build System.
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