summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-06-121-0/+7
| | |\
| | * | Doc: Work on the 4.5.2 changes file.Geir Vattekar2009-06-121-152/+124
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-253-6/+98
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-0/+19
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Changes for 4.5.2Leonardo Sobral Cunha2009-06-121-0/+7
| | |/
| | * More entries for the change logJens Bache-Wiig2009-06-081-0/+12
| | |
| * | Update change log with behavior changes in Graphics View.Andreas Aardal Hanssen2009-06-091-10/+23
| | |
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-2/+79
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| | * My changes for 4.5.2Jarek Kobus2009-06-081-0/+4
| | |
| * | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-0/+73
| |\ \
| * \ \ Merge branch '4.5'Denis Dzyubenko2009-06-021-1/+40
| |\ \ \
| * \ \ \ Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-0/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * | | | | Made GL2 engine default for QGLWidget, and added GL2 sync() functionSamuel Rødal2009-05-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow mixing QPainter and raw OpenGL commands we need to have some way for the user to say that's he's about to use raw OpenGL so that we are free to do buffering optimizations in the paint engines and use either GL1 or GL2 paint engine. As there's already a syncState() function in QPaintEngine we've reused this and added QPaintEngineEx::sync() which takes care of syncing/flushing the paint engine. Reviewed-by: Trond
| * | | | | Merge branch '4.5'Thiago Macieira2009-05-221-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-201-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-0/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-05-181-2/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * | | | | | | | | Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-151-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStyleOptionGraphicsItem extends QStyleOption with three values: 1) matrix, 2) levelOfDetail, 3) exposedRect, and they all involve expensive QTranform operations when calculated. We pass style option(s) to drawItems() and paint(), but the extended values are usually not in use. We can therefore gain quite some nice speedup by making them opt-in with the QGraphicsItem::ItemUsesExtendedStyleOption flag. Additionally, QStyleOptionGraphicsItem::levelOfDetail has been obsoleted, and a new function QStyleOptionGraphicsItem:: levelOfDetailFromTransform(const QTransform &) has been added. Me and Andreas don't consider this change to be too controversial even though it changes the behavior. Auto tests still pass. Reviewed-by: Andreas
| * | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-271-0/+123
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Made urls more consistent and maintainable.Alessandro Portale2009-04-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://qtsoftware.com/support-services/support/platform-support-policy still points to a dead link, though.
| * | | | | | | | | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-0/+41
| | | | | | | | | | |
* | | | | | | | | | | exceptions added to changes docmread2009-06-221-0/+26
| | | | | | | | | | |
* | | | | | | | | | | Tower changesIain2009-06-221-2/+6
| | | | | | | | | | |
* | | | | | | | | | | Brought the file in sync with the Tower release file.axis2009-06-221-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Corrected typo.axis2009-06-221-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Added changes releated to anomaly browserMiikka Heikkinen2009-06-221-0/+4
| | | | | | | | | | |
* | | | | | | | | | | Changed to a more accurate change description.axis2009-06-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elements always had input method support. It was the virtual keyboard that was missing.
* | | | | | | | | | | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-06-221-16/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.5.2-tower
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicEspen Riskedal2009-06-221-55/+149
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.5.2-tower
| * | | | | | | | | | | | some small cosmetic changesEspen Riskedal2009-06-221-18/+14
| | | | | | | | | | | | |
* | | | | | | | | | | | | Sorted changes entries by class names.axis2009-06-221-142/+140
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Added jbarron's changes to the changelog.Jason Barron2009-06-221-0/+36
| | | | | | | | | | | |
* | | | | | | | | | | | Adding chagest for Tower,Aleksandar Sasha Babic2009-06-221-0/+27
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-06-221-56/+66
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.5.2-tower
| * | | | | | | | | | | | Cleaning up changes doc.Miikka Heikkinen2009-06-221-56/+66
| |/ / / / / / / / / / /
* | | | | | | | | | | | Added my changes to changes-4.5.2-tower.axis2009-06-221-0/+25
|/ / / / / / / / / / /
* | | | | | | | | | | aportales changes for Qt for S60 "Tower"Alessandro Portale2009-06-171-0/+15
| | | | | | | | | | |
* | | | | | | | | | | added changes done to towerMarkku Luukkainen2009-06-171-2/+12
| | | | | | | | | | |
* | | | | | | | | | | Include Phonon changes.Frans Englich2009-06-151-2/+5
| | | | | | | | | | |
* | | | | | | | | | | updated changes-4.5.2-tower.Janne Koskinen2009-06-151-1/+5
| | | | | | | | | | |
* | | | | | | | | | | S60Style: changes for style to Tower release.Sami Merilä2009-06-151-51/+74
| | | | | | | | | | |
* | | | | | | | | | | Updated changes-4.5.2-tower.Janne Anttila2009-06-151-4/+115
| | | | | | | | | | |
* | | | | | | | | | | Added my changes to Tower changes document.Miikka Heikkinen2009-06-151-11/+59
| | | | | | | | | | |
* | | | | | | | | | | start on changes file for Tower releaseEspen Riskedal2009-06-111-0/+101
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-081-1/+204
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * | | | | | | | | | Fixed typos.Trond Kjernåsen2009-06-051-2/+2
| | | | | | | | | | |
| * | | | | | | | | | My 4.5.2 changes.Trond Kjernåsen2009-06-051-1/+43
| | | | | | | | | | |
| * | | | | | | | | | My changes for 4.5.2.jasplin2009-06-051-0/+18
| | | | | | | | | | |
| * | | | | | | | | | My changes for 4.5.2Thomas Hartmann2009-06-051-1/+3
| | | | | | | | | | |
| * | | | | | | | | | My changelog for 4.5.2Alexis Menard2009-06-051-0/+11
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |