Branches: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
| Line 1: | Line 1: | ||
[toc align_right="yes" depth="2"] | |||
[[Category:Tools::Qt Creator:Branches]] | |||
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: | * Anonymous checkout: <code&gt;$ git clone http://codereview.qt.io/p/&lt;project&gt;/&lt;repo&gt;</code&gt; | ||
* | * SSH (push to Gerrit): please check [[Setting up Gerrit]]. | ||
= | = Qt 5 = | ||
== Mainline branches == | |||
dev, the current stable branch (5.3 as of Jun '14), and a possibly existing current release branch follow the [[Branch Guidelines]]. | |||
* 5.3, which should be used for new changes | '''Special situation''': due to the ongoing change of branching schemes, there are currently two stabilization branches:<br />* 5.3, which should be used for new changes<br />* stable, which should be used only to complete pending reviews<br />* stable will be periodically merged into 5.3, and will be deleted around end of June '14. | ||
* stable, which should be used only to complete pending reviews | |||
* stable will be periodically merged into 5.3, and will be deleted around end of June | |||
==Other branches== | == Other branches == | ||
Used for research or development of complex features.<br /> Feature branch names should be prefixed with wip/. Exceptions are historical.<br /> Feature branches often have relaxed review and integration policies and may be subject to occasional rebasing. | Used for research or development of complex features.<br />Feature branch names should be prefixed with wip/. Exceptions are historical.<br />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. | ||
===ios (misnomer, should be wip/ios)=== | === ios (misnomer, should be wip/ios) === | ||
===wip/qstring-utf8=== | === wip/qstring-utf8 === | ||
===winrt (misnomer, should be wip/winrt)=== | === winrt (misnomer, should be wip/winrt) === | ||
Used for development of | 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 (base+declarative+quickcontrols+…)=== | === wip/tizen (base+declarative+quickcontrols+…) === | ||
=Qt 4= | = Qt 4 = | ||
==Mainline branches== | == Mainline branches == | ||
The 4.8 branch follows the [[ | The 4.8 branch follows the [[Branch Guidelines]]. | ||
==Other branches== | == Other branches == | ||
===4.8-bb10=== | === 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 is 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 is subject to rebasing. | ||
=Qt Creator= | = Qt Creator = | ||
Also see [[Submit- | Also see [[Submit-Policies]] | ||
==master Branch== | == master Branch == | ||
Branch that will become 3.2 at some point. | Branch that will become 3.2 at some point. | ||
* | * "Browse review requests&quot;:http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:master,n,z | ||
* | * "Browse source&quot;:https://qt.gitorious.org/qt-creator/qt-creator/trees/master | ||
* Check out: | * Check out: <code&gt;$ git checkout master&lt;/code&gt; | ||
==Release branches== | == Release branches == | ||
===3.1 Branch=== | === 3.1 Branch === | ||
Forked from master for 3.1 development, the main development branch until shortly before 3.1.0 release. | Forked from master for 3.1 development, the main development branch until shortly before 3.1.0 release. | ||
* | * "Browse review requests&quot;:http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:3.1,n,z | ||
* | * "Browse source&quot;:https://qt.gitorious.org/qt-creator/qt-creator/trees/3.1 | ||
* Check out: | * Check out: <code&gt;$ git checkout 3.1&lt;/code&gt; | ||
===3.0 Branch=== | === 3.0 Branch === | ||
Forked from master for 3.0 development. Frozen. | Forked from master for 3.0 development. Frozen. | ||
* | * "Browse review requests&quot;:http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:3.0,n,z | ||
* | * "Browse source&quot;:https://qt.gitorious.org/qt-creator/qt-creator/trees/3.0 | ||
* Check out: | * Check out: <code&gt;$ git checkout 3.0&lt;/code&gt; | ||
==Other branches== | == Other branches == | ||
Used for research or development of complex features. | Used for research or development of complex features. | ||
===wip/clang=== | === wip/clang === | ||
Branch to research the use of [http://clang.llvm.org clang] as a replacement for Qt Creator's own code model. You find the plan for how we want to proceed with Qt Creator's code model(s) in our mailing list archive: http://lists.qt.io/pipermail/qt-creator/2012-February/000251.html | |||
* | * "Browse review requests&quot;:http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:wip/clang,n,z | ||
* "Browse source&quot;:https://qt.gitorious.org/qt-creator/qt-creator/trees/wip/clang | |||
* Check out: <code&gt;$ git checkout -b wip/clang origin/wip/clang&lt;/code&gt; | |||
* [[wip-clang setting up|Setting up build enviroment]] | |||
* [[wip clang todo items|Todo items]] | |||
* [[clang bugs at wip clang branch|Clang bugs]] | |||
* [[clang hacking notes for wip clang branch|Clang hacking notes]] | |||
=== | === 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.<br />* At the moment plugin supports:<br />'''''' editing of project's properties (this feature waits for a code review on Gerrit)<br />'''''' adding/removing files, filters and folders to/from a project (also waits for a code review on Gerrit).<br />'''''' building a Visual Studio (.vcproj) project<br />* "How to set up&quot;:http://wiki.qt.io/Setting-Up-Visual-Studio-Plugin | ||
Revision as of 14:42, 23 February 2015
[toc align_right="yes" depth="2"]
All branches listed below reside in Gerrit on http://codereview.qt.io and are publicly available.
- Anonymous checkout: <code>$ git clone http://codereview.qt.io/p/<project>/<repo></code>
- SSH (push to Gerrit): please check Setting up Gerrit.
Qt 5
Mainline branches
dev, the current stable branch (5.3 as of Jun '14), and a possibly existing current release branch follow the Branch Guidelines.
Special situation: due to the ongoing change of branching schemes, there are currently two stabilization branches:
* 5.3, which should be used for new changes
* stable, which should be used only to complete pending reviews
* stable will be periodically merged into 5.3, and will be deleted around end of June '14.
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.
ios (misnomer, should be wip/ios)
wip/qstring-utf8
winrt (misnomer, should be wip/winrt)
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 (base+declarative+quickcontrols+…)
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 is subject to rebasing.
Qt Creator
Also see Submit-Policies
master Branch
Branch that will become 3.2 at some point.
- "Browse review requests":http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:master,n,z
- "Browse source":https://qt.gitorious.org/qt-creator/qt-creator/trees/master
- Check out: <code>$ git checkout master</code>
Release branches
3.1 Branch
Forked from master for 3.1 development, the main development branch until shortly before 3.1.0 release.
- "Browse review requests":http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:3.1,n,z
- "Browse source":https://qt.gitorious.org/qt-creator/qt-creator/trees/3.1
- Check out: <code>$ git checkout 3.1</code>
3.0 Branch
Forked from master for 3.0 development. Frozen.
- "Browse review requests":http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:3.0,n,z
- "Browse source":https://qt.gitorious.org/qt-creator/qt-creator/trees/3.0
- Check out: <code>$ git checkout 3.0</code>
Other branches
Used for research or development of complex features.
wip/clang
Branch to research the use of clang as a replacement for Qt Creator's own code model. You find the plan for how we want to proceed with Qt Creator's code model(s) in our mailing list archive: http://lists.qt.io/pipermail/qt-creator/2012-February/000251.html
- "Browse review requests":http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:wip/clang,n,z
- "Browse source":https://qt.gitorious.org/qt-creator/qt-creator/trees/wip/clang
- Check out: <code>$ git checkout -b wip/clang origin/wip/clang</code>
- Setting up build enviroment
- Todo items
- Clang bugs
- Clang hacking notes
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":http://wiki.qt.io/Setting-Up-Visual-Studio-Plugin