summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-012-161/+278
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-281-173/+246
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/engine.h demos/spectrum/app/mainwidget.h demos/spectrum/app/settingsdialog.h demos/spectrum/app/spectrograph.h demos/spectrum/app/spectrumanalyser.h demos/spectrum/app/tonegenerator.h demos/spectrum/app/tonegeneratordialog.h demos/spectrum/app/utils.h demos/spectrum/app/waveform.h tests/auto/qtextcodec/tst_qtextcodec.cpp
| | * Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
| | |
| | * My 4.6.3 changesSami Merila2010-05-261-0/+45
| | |
| | * Tidy changes file for 4.6.3.Jason McDonald2010-05-261-219/+137
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * My 4.6.3 changesMiikka Heikkinen2010-05-261-4/+84
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * My 4.6.3 changesGareth Stockwell2010-05-251-0/+6
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-251-8/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. ...
| | * | Updating 4.7.0 change log.Bjørn Erik Nilsen2010-05-251-0/+4
| | | |
| | * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| | * | | 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 remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-251-2/+43
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/app.pro src/gui/egl/qegl.cpp tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qmenu/tst_qmenu.cpp
| | * | | My 4.6.3 changes.Yoann Lopes2010-05-211-0/+21
| | | | |
| | * | | changes-4.6.3 updatedJoerg Bornemann2010-05-211-1/+21
| | | | |
| | * | | Typo.Trond Kjernåsen2010-05-211-1/+1
| | | | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-252-14/+127
|\| | | |
| * | | | 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
| | | |/ | | |/|
| * | | 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
| | | |
* | | | 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-291-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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 10:42:30 +0000