summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241-1/+1
|\ | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: changes-4.7.0 updated Revert "Deselect the current selection when the QItemSelectionModel::model is reset." add missing include Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Fixed an assert in QMenu
| | * changes-4.7.0 updatedJoerg Bornemann2010-05-211-1/+1
| | |
* | | Remove Q_PACKED from QChar and QLocale::Data.Thiago Macieira2010-05-231-0/+7
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-211-8/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message close scope while inside assignment only if the last char is a closing brace deprecate undocumented -E option use qtPrepareTool for qdoc unify QMAKE_QMAKE path separator fixing simplify arcane conditional, once again qdoc: Propagate the language information into the XML as before. Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X ...
| * | Removed a change from the 4.7.0 change log.Kim Motoyoshi Kalland2010-05-201-6/+0
| | | | | | | | | | | | The change belongs in the 4.6.3 change log.
| * | update 4.7.0 changesKent Hansen2010-05-201-2/+0
| |/ | | | | | | | | Mistakenly added something that was fixed for 4.6.3 (it's been moved to changes-4.6.3 in a different branch).
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-211-13/+126
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-211-13/+126
| |\
| | * My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | |
| | * Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4
| | |
| | * My 4.6.3 changes.Samuel Rødal2010-05-201-0/+12
| | |
| | * Add my 4.6.3 changesKent Hansen2010-05-201-2/+19
| | |
| | * My changelog entries for 4.6.3Denis Dzyubenko2010-05-201-2/+9
| | | | | | | | | | | | Reviewed-by: trustme
| | * Add my changes to the 4.6.3 changes logEskil Abrahamsen Blomfeldt2010-05-201-2/+14
| | |
| | * my changelog for 4.6.3Peter Hartmann2010-05-201-4/+9
| | |
* | | 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
|/ /
* | 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
| |
* | 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
| |
* | 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
generated by cgit v0.12 at 2025-03-08 06:56:54 (GMT)