Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-16 | 2 | -2/+32 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp | ||||
| * | doc: Added info on two ways to customize the style. | Martin Smith | 2009-06-16 | 1 | -0/+30 |
| | | |||||
| * | doc: Fixed several qdoc errors. | Martin Smith | 2009-06-16 | 1 | -1/+1 |
| | | |||||
| * | Added a code snippet for QProxyStyle | Jens Bache-Wiig | 2009-06-15 | 1 | -0/+15 |
| | | |||||
| * | Sync application example documentation with actual example | mae | 2009-06-15 | 1 | -8/+8 |
| | | | | | | | | | | | | The example now uses QPlainTextEdit instead of QTextEdit Reviewed-by: kavindra | ||||
| * | Fixed multiline doc for Qt::DropAction. | Denis Dzyubenko | 2009-06-12 | 1 | -3/+3 |
| | | |||||
| * | Removed \since 4.6 tag, mentioned that only the enum value is since 4.6 | Denis Dzyubenko | 2009-06-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bjørn Erik Nilsen | 2009-06-12 | 2 | -41/+27 |
| |\ | |||||
| | * | QHttp: Class made obsolete, changed module QDoc. | Markus Goetz | 2009-06-12 | 1 | -40/+26 |
| | | | | | | | | | | | | | | | | | | | | | This should better communicate that new applications should use QNetworkAccessManager. Reviewed-by: David Boddie | ||||
| | * | doc: Fixed several qdoc warnings. | Martin Smith | 2009-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 2 | -50/+55 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm | ||||
| | * | We do only support files inside or in subdirs of the help project. | kh | 2009-06-11 | 1 | -45/+50 |
| | | | | | | | | | | | | | | | Task-number: 255888 Reviewed-by: kh | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-08 | 1 | -5/+5 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| * | | doc: Fixed several qdoc warnings. | Martin Smith | 2009-06-12 | 1 | -4/+7 |
| | | | |||||
* | | | Merge of master | Bradley T. Hughes | 2009-06-15 | 7 | -107/+116 |
| | | | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-12 | 5 | -15/+36 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * | | Doc: Make it easier to find supported platform information from the | David Boddie | 2009-06-11 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | installation page. Reviewed-by: Trust Me | ||||
| * | | Doc: Added information about QDBUS_DEBUG to the D-Bus documentation. | David Boddie | 2009-06-11 | 2 | -1/+23 |
| | | | | | | | | | | | | | | | Task-number: 253715 Reviewed-by: Trust Me | ||||
| * | | Remove var->QMAKE_COMP_var docs, and mark feature unsupported. | Marius Storm-Olsen | 2009-06-11 | 1 | -4/+0 |
| | | | | | | | | | | | | Reviewed By: andy | ||||
| * | | Some adjustments to the documentation | Jens Bache-Wiig | 2009-06-10 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | Headers are slightly lighter now. Not all tables are affected by the changes any more. | ||||
* | | | rename Qt::WA_AcceptedTouchBeginEvent to Qt::WA_WState_AcceptedTouchBeginEvent | Bradley T. Hughes | 2009-06-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | this is an internal widget state variable, so the name should reflect that (and we shouldn't include it in the docs either) | ||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-10 | 2 | -4/+37 |
|\ \ \ | |/ / | |||||
| * | | Fix some incorrect license headers. | Jason McDonald | 2009-06-10 | 1 | -3/+33 |
| | | | | | | | | | | | | | | | | | | | | | The MODULE placeholder shouldn't be used anymore, and neither should the old Trolltech license header. Reviewed-by: Trust Me | ||||
| * | | doc: Corrected the rich text page wrt smallcaps. | Martin Smith | 2009-06-09 | 1 | -1/+4 |
| | | | | | | | | | | | | Task-number: 254912 | ||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-08 | 5 | -715/+930 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Oswald Buddenhagen | 2009-06-08 | 4 | -709/+925 |
| |\ \ | |||||
| | * | | Doc: Added information about the Fontconfig and FreeType dependencies. | David Boddie | 2009-06-08 | 3 | -693/+908 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 250349 Reviewed-by: Trust Me | ||||
| | * | | Reflected the state machine framework API changes on documentation. | Bruno Abinader | 2009-06-08 | 1 | -16/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 602 Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
| * | | | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-08 | 1 | -6/+5 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -2/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed another typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - cleaned up a sentence to improve clarity | Kavindra Devi Palaraja | 2009-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-05 | 5 | -21/+36 |
|\ \ \ | |/ / | |||||
| * | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-06-04 | 1 | -10/+10 |
| |\ \ | | |/ | |||||
| | * | Doc - some sentence clean ups | Kavindra Devi Palaraja | 2009-06-03 | 1 | -7/+7 |
| | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | * | Doc - minor fixes to beautify the sentence | Kavindra Devi Palaraja | 2009-06-03 | 1 | -2/+2 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | * | Doc - fixed a typo | Kavindra Devi Palaraja | 2009-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| * | | Doc: Added information about the Fontconfig and FreeType dependencies. | David Boddie | 2009-06-03 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | Task-number: 250349 Reviewed-by: Trust Me | ||||
| * | | Doc: Modified the property documentation to relax the restriction on | David Boddie | 2009-06-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | const getter functions. Task-number: 254722 Reviewed-by: Trust Me | ||||
| * | | Merge branch '4.5' | Denis Dzyubenko | 2009-06-02 | 2 | -7/+12 |
| |\ \ | | |/ | |||||
| | * | Doc - changing the "main layout" term to "top level widget's layout" to | Kavindra Devi Palaraja | 2009-06-02 | 2 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | preserve some consistency. Also added a screenshot of the Object Insepector displaying a form where its widget has no top level layout. Reviewed-By: TrustMe | ||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-29 | 23 | -100/+125 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.5' | Tom Cooksey | 2009-05-28 | 2 | -11/+8 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp | ||||
| | * | Doc - final screenshot and changes | Kavindra Devi Palaraja | 2009-05-28 | 2 | -11/+8 |
| | | | |||||
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-27 | 20 | -83/+75 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-26 | 9 | -56/+47 |
| | |\ | |||||
| | | * | Doc - more images and additional description | Kavindra Devi Palaraja | 2009-05-26 | 6 | -11/+13 |
| | | | | |||||
| | | * | Doc - whitespace cleaning | Kavindra Devi Palaraja | 2009-05-26 | 1 | -24/+24 |
| | | | |