summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-201-2/+57
|\
| * Updated the 4.7.0 change log with my changes.Kim Motoyoshi Kalland2010-05-191-0/+16
| |
| * Some more 4.7.0 changesJens Bache-Wiig2010-05-181-2/+17
| |
| * My 4.7.0 changesKent Hansen2010-05-181-0/+22
| |
| * Embedded changes for 4.7Paul Olav Tvete2010-05-181-0/+2
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-191-2/+120
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf
| * Changelog: Added Designer/uic3 changes for 4.7.0.Friedemann Kleint2010-05-171-2/+12
| |
| * More 4.7 stuff.Trond Kjernåsen2010-05-141-0/+3
| |
| * Some 4.7 changes.Trond Kjernåsen2010-05-141-4/+9
| |
| * Updated changelog.Yoann Lopes2010-05-141-0/+12
| |
| * My 4.7.0 changelog entries.Samuel Rødal2010-05-071-0/+29
| |
| * my changesaavit2010-05-071-0/+16
| |
| * My changelog entries for core and networkMarkus Goetz2010-05-061-4/+21
| |
| * my changelogPeter Hartmann2010-05-061-0/+19
| |
| * Update changelog.Aaron McCarthy2010-05-051-0/+7
| |
* | Remove QT_NO_THREAD support for QHostInfoMarkus Goetz2010-05-181-0/+1
| | | | | | | | Reviewed-by: Thiago
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-281-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update changelog after last change. QTabBar: smaller minimumSizeHint in ElideMode, and unit-test. Fix tab stop in QPainter::drawText()
| * | Update changelog after last change.Olivier Goffart2010-04-281-0/+2
| | | | | | | | | | | | | | | Document the change introduced by the merge request 583 (89db625958949cf94f112fc2f9e6a3bf6399e43b)
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-272-4/+29
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
| * changes-4.7.0 updatedJoerg Bornemann2010-04-271-0/+25
| |
| * Fix URL for Qt Bug Tracker.Jason McDonald2010-04-221-3/+3
| |
| * fix typosOswald Buddenhagen2010-04-201-1/+1
| |
* | Long live Qt 4.8!Jason McDonald2010-04-221-0/+130
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-251-0/+10
|\ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * Update changelogThiago Macieira2010-03-241-0/+10
| |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+8
|\ \ | |/ |/| | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Updated dist/changes-4.6.3Gareth Stockwell2010-03-221-0/+8
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-5/+5
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Fix obsolete URL's.Jason McDonald2010-03-091-5/+5
| | | | | | | | | | Task-number: QT-3051 Reviewed-by: Trust Me
* | Updated URLs.Robert Loehning2010-03-042-3/+3
| | | | | | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* | Updates to changes fileaavit2010-03-021-0/+6
| | | | | | | | Reviewed-by: trustme
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * | Changelog update for 4.7.Trond Kjernåsen2010-02-161-1/+5
| | |
| * | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-151-0/+125
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp
* | \ \ Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-0/+159
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | | Add skeleton changes file for 4.6.3.Jason McDonald2010-02-161-0/+159
| |/ / | | | | | | | | | Reviewed-by: Trust Me
* | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * | Added geometry shaders to changes-4.7.0 file + a small doc update about itGunnar Sletta2010-02-101-0/+3
| | |
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-177/+97
|\ \ \ | |/ / |/| / | |/
| * Tidy the changes file.Jason McDonald2010-02-091-177/+97
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-13/+130
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-061-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | * Iain's changes for 4.6.2Iain2010-02-051-0/+8
| | |
| * | Merge remote branch 'origin/4.6' into 4.6Paul Olav Tvete2010-02-051-16/+83
| |\ \ | | |/ | | | | | | | | | Conflicts: dist/changes-4.6.2
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-051-12/+79
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Another fix for the non unified title+toolbar regarding text under icons My 4.6.2 changes Added my changes to changes file. Doc: Correcting image My changes for 4.6.2 My changelog for 4.6.2 My Changelog entries for 4.6.2 Add the QMAKE_FILE_EXT variable to extra compilers generation. Doc: Removed promisse to fix a problem Add some entries to the change log Change log updated Improve raster graphics system performance on Mac (second try). I10n/German: Update translations for 4.6.2 I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
| | | * My 4.6.2 changesThiago Macieira2010-02-041-16/+47
| | | |
| | | * Added my changes to changes file.axis2010-02-041-0/+6
| | | |
| | | * My changes for 4.6.2João Abecasis2010-02-041-0/+6
| | | |
| | | * My changelog for 4.6.2Yoann Lopes2010-02-041-0/+2
| | | |
| | | * My Changelog entries for 4.6.2Markus Goetz2010-02-041-2/+15
| | | |
generated by cgit v0.12 at 2024-11-14 23:28:07 (GMT)