Branches: Difference between revisions

From Qt Wiki
Jump to navigation Jump to search
(Convert ExpressionEngine links)
Line 44: Line 44:
= Qt Creator =
= Qt Creator =


Also see [[Submit Policies]]
See [[Submit-Policies]] for Qt Creator's branching policy.
 
Qt Creator uses the same branching policy as Qt itself, both for mainline and for WIP branches.
 
=== 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
 
* [http://codereview.qt.io/#q,status:open+project:qt-creator/qt-creator+branch:wip/clang,n,z Browse review requests]
* [https://qt.gitorious.org/qt-creator/qt-creator/trees/wip/clang Browse source]
* Check out: <code>$ git checkout -b wip/clang origin/wip/clang</code>
* [[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 ===
=== wip/vcproj ===

Revision as of 08:31, 13 April 2015


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, the current stable branch (5.5 as of Mar '15), and a possibly existing current release branch follow 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.

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

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
Retrieved from "https://wiki.qt.io/index.php?title=Branches&oldid=15742"