Changes between Version 38 and Version 39 of QtWebKitContrib


Ignore:
Timestamp:
Jun 25, 2009, 9:00:57 AM (16 years ago)
Author:
treat@kde.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • QtWebKitContrib

    v38 v39  
    33= Contributing to the Qt Port of WebKit =
    44
    5 [http://www.staikos.net/ Staikos Computing Services Inc] is hosting a  [http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=summary public git repository] of the QtWebKit port.
     5[http://gitorious.org/qtwebkit Gitorious.org] is hosting a [http://gitorious.org/qtwebkit public git repository] of the QtWebKit port.
    66
    77== Reporting Bugs ==
    … …  
    1010
    1111== Checking out the sources ==
    12 Developers who wish to contribute to the port can check out the sources like so
     12Developers who wish to contribute to the port can check out the sources like so:
    1313
    1414{{{
    15 git clone git://code.staikos.net/webkit
     15git clone git://gitorious.org/qtwebkit/qtwebkit.git
    1616}}}
    17 
    18 After the initial clone you can update your sources with new changes using
    19 {{{
    20 cd webkit
    21 git pull
    22 }}}
    23 
    2417
    2518== Hacking on QtWebKit ==
    … …  
    6659 * [http://eagain.net/articles/git-for-computer-scientists/ An excellent article on Git for computer scientists]
    6760
    68 == The Team ==
    69  * [wiki:"WebKit Team#LarsKnolllarsreview" Lars Knoll]
    70  * [wiki:"WebKit Team#SimonHausmanntronicalreview"  Simon Hausmann] (IRC: tronical)
    71  * [wiki:"WebKit Team#HolgerFreytherzeckereview"  Holger Freyther] (IRC: zecke)
    72  * [wiki:"WebKit Team#GeorgeStaikosreview"  George Staikos] (IRC: pmax)
    73  * [wiki:"WebKit Team#AdamTreatcommit"  Adam Treat] (IRC: manyoso)
    74  * [wiki:"WebKit Team#ZackRusinzackrreview"  Zack Rusin] (IRC: zackr)
    75  * Michael Goddard (Qtopia developer)
    76  * Michael Brasser (Qtopia developer)
    77  * Tor Arne Vestbø (IRC: torarne)
    78  * Benjamin Meyer (IRC: icefox)
    79  * Ariya Hidayat (IRC: ariya)
    80  * Kenneth Rohde Christiansen (IRC: kenneth or kenne)
    81  * Antonio Gomes (IRC: tonikitoo)
    82 
    83 == Additional Contributors with Check-In Privileges to QtWebKit's Git Repository ==
    84  * Thiago Macieira
    85  * Marius Bugge Monsen
    86  * Eli Fidler
    87  * Mike Fenton
    88  * Marc Ordinasillopis
    89  * Jörg Bornemann
    90 
    9161== The Plan ==
    9262 * [wiki:"QtWebKitTodo" TODO List]
    … …  
    10777Patches that are not specific to the QtWebKit port of the webkit project should not be submitted to the git repository rather they should be contributed directly to the upstream public webkit svn repository.
    10878
    109 To obtain check in privileges to the git repository the contributor should send a public ssh key to the [mailto:webkit-admin@staikos.net administrator] of the repository.
    110 
    111 == Cherry-Picking bugfixes from the trunk ==
    112 
    113 If you've found a bugfix in the trunk that should go into the next stable Qt patch release, follow these steps:
    114 
    115   1. Clone [http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit-tools;a=summary webkit-tools]
    116   1. Clone and checkout the {{{qtwebkit-4.5}}} branch of the [http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=summary Git Repository]
    117   1. Run {{{webkit-cherry-pick sha1}}}
    118   1. Run git commit if the cherry-pick produced conflicts.
    119   1. Push the resulting branch.
    120   1. To update WebKit in {{{src/3rdparty/webkit}}} in Qt, simply run {{{util/webkit/mkdist-webkit}}}
     79To obtain check in privileges to the git repository the contributor should inquire from one of the Administrator(s) of the [http://gitorious.org/+qtwebkit-developers qtwebkit-developers team.]