summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-022-9/+180
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Bump version to 4.6.1Jason McDonald2009-12-011-0/+159
| | | | | | | | Reviewed-by: Trust Me
| * Minor changelog updatesJason McDonald2009-11-271-9/+21
| | | | | | | | Reviewed-by: Olivier Goffart
* | Merge branch '4.6'Thiago Macieira2009-11-252-83/+139
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Fix links to docs in INSTALL and READMEJason McDonald2009-11-251-2/+2
| | | | | | | | | | | | | | | | The names of the doc directories on the doc site don't include the patch version number. Task-number: QTBUG-6043 Reviewed-by: Trust Me
| * Mention the changed architecture and license of QtScript in the 4.6.0 changelogSimon Hausmann2009-11-201-0/+2
| | | | | | | | Reviewed-by: Kent Hansen
| * Add entry about behavior changes due to QtScript using JavaScriptCoreKent Hansen2009-11-191-0/+7
| |
| * Changes file cleanup and adding of new features.Volker Hilsheimer2009-11-181-108/+113
| |
| * Reapply change log fix.Jedrzej Nowacki2009-11-171-2/+1
| | | | | | | | | | | | | | Change 8586237d9400c5669e62e97bfb00b4a2579c7646 overwrote a log fix d39104d9b0ce43f872d2880baef8e1cff289adb8 Reviewed-by: TrustMe
| * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-161-0/+47
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-132-150/+854
| | |\ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * | Add some of my changes to changes-4.6.0Eskil Abrahamsen Blomfeldt2009-11-091-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | Update changes-4.6.0 with relevant changes. Reviewed-by: Trond
| * | | Fix broken merge of changes file.Jason McDonald2009-11-131-4/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.6'Thiago Macieira2009-11-132-412/+464
|\ \ \ \ | |/ / /
| * | | Add an entry to the changelog about the XUnit support in QtTestThiago Macieira2009-11-131-1/+4
| | |/ | |/|
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-121-6/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/corelib/tools/qscopedpointer_p.h src/gui/widgets/qlcdnumber.cpp
| | * | Changes file updatedaavit2009-11-111-0/+2
| | | |
| | * | Sort sections in changes file so things are easier to find.Jason McDonald2009-11-111-159/+159
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | First pass review of changes file.Jason McDonald2009-11-111-303/+336
| | | | | | | | | | | | | | | | | | | | | | | | Cleanup descriptions + reformat to 80 columns. Reviewed-by: Trust Me
| | * | Document changes for Ian Walters.Rhys Weatherley2009-11-111-0/+3
| | | |
| | * | QWS keymap changesRobert Griebl2009-11-111-0/+6
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Changelog updateJedrzej Nowacki2009-11-111-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelog update contains all major changes in QtWebkit, QtScript and brief information about the state machine framework. Reviewed-by: Simon Hausmann
| | * | Added some changes to changes-4.6.0.Samuel Rødal2009-11-111-0/+13
| | | |
| | * | linguist changesOswald Buddenhagen2009-11-111-4/+34
| | | |
| | * | Document change of qdoc3 binary location.Daniel Molkentin2009-11-111-1/+6
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Add my changes to the 4.6.0 changelogJørgen Lind2009-11-111-0/+4
| | | |
| | * | My changeJarek Kobus2009-11-111-0/+4
| | | |
| | * | Some 4.6.0 changes.Trond Kjernåsen2009-11-111-23/+35
| | | |
| | * | Add my changes to the 4.6.0 changelogLeonardo Sobral Cunha2009-11-111-4/+11
| | | |
| | * | Changelog: part 2Thiago Macieira2009-11-111-25/+41
| | | |
| | * | Add my changes to the 4.6.0 changelog.Bradley T. Hughes2009-11-111-2/+56
| | | |
| | * | Added my changes in Qt 4.6.0 to the change log.Kim Motoyoshi Kalland2009-11-111-2/+5
| | | |
| | * | Added my changelog entries.axis2009-11-111-0/+5
| | | |
| | * | Add some of my changes to changes-4.6.0Eskil Abrahamsen Blomfeldt2009-11-111-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changes-4.6.0 with relevant changes. Reviewed-by: Trond Conflicts: dist/changes-4.6.0
| | * | Added my changes to changes-4.6.0.Kim Motoyoshi Kalland2009-11-111-0/+23
| | | |
| | * | Changelog: My changes.Thiago Macieira2009-11-111-15/+58
| | | | | | | | | | | | | | | | Also reorganise some things I saw wrong.
| | * | Updated changelog with my changesBenjamin Poulain2009-11-111-0/+15
| | | |
| | * | Richards changes into the changelogRichard Moe Gustavsen2009-11-111-0/+17
| | | |
| | * | My changes for 4.6.0Paul Olav Tvete2009-11-111-0/+10
| | | |
| | * | Updated changelog with my changesTom Cooksey2009-11-111-0/+33
| | | |
| | * | Update change log with multimedia changes.Andrew den Exter2009-11-111-0/+6
| | | |
| | * | update changelogDerick Hawcroft2009-11-111-0/+3
| | | |
| | * | update dist/changes-4.6.0Bill King2009-11-111-0/+25
| | | |
| * | | Changelog fixJedrzej Nowacki2009-11-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Printing shrink factor will be removed from qt 4.6.0. Reviewed-by: Jocelyn Turcotte
| * | | Make README more accurate for Mac OS X.Jason McDonald2009-11-121-4/+8
| | | | | | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| * | | Changes file updatedaavit2009-11-111-0/+2
| | | |
| * | | Sort sections in changes file so things are easier to find.Jason McDonald2009-11-111-159/+159
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-111-5/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * | | Document changes for Ian Walters.Rhys Weatherley2009-11-111-0/+3
| | | | |
| * | | | First pass review of changes file.Jason McDonald2009-11-111-301/+337
| |/ / / | | | | | | | | | | | | | | | | | | | | Cleanup descriptions + reformat to 80 columns. Reviewed-by: Trust Me