Editing Qt Maemo Git Process
Warning: You are not logged in.
Your IP address will be recorded in this page's edit history.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
- | + | The Maemo version of Qt lives here: | |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
http://gitorious.org/+qt-maemo-developers/qt/qt-maemo | http://gitorious.org/+qt-maemo-developers/qt/qt-maemo | ||
- | |||
- | |||
- | + | If you have a local clone you can use <code>gitk --all</code> to see a visual representation of the branches, commits and merges. | |
- | + | ||
- | + | ||
- | + | lbt proposed this explanation of the branches/workflow based on the [[Mer/Build/UsingGitorious|Mer gitorious workflow]] | |
- | |||
== Origin == | == Origin == | ||
The branches are synced with upstream Qt changes. No Maemo changes are there at all. | The branches are synced with upstream Qt changes. No Maemo changes are there at all. | ||
Line 26: | Line 16: | ||
== Maemo master branches == | == Maemo master branches == | ||
+ | Currently we have 4.5 master branch only. | ||
- | + | === master-maemo-qt-45 === | |
- | === | + | |
- | + | ||
This branch is | This branch is | ||
* based on 4.5 | * based on 4.5 | ||
Line 52: | Line 41: | ||
Diablo branch | Diablo branch | ||
- | === qt- | + | === qt-fremantle === |
- | + | Fremantle branch. debian/ dir is not there yet. Hence you cannot build deb packages. Ask to Antonio for more info about it. | |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
=== qt-mer === | === qt-mer === | ||
Line 133: | Line 118: | ||
[[Image:MaemoQtOnGit-Diagram-opt2.jpg]] | [[Image:MaemoQtOnGit-Diagram-opt2.jpg]] | ||
- | |||
- | |||
- |
Learn more about Contributing to the wiki.