summaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | | * Add some entries to the change logJens Bache-Wiig2010-02-041-3/+9
| | | |
| | | * Change log updatedPrasanth Ullattil2010-02-041-1/+4
| | | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-051-5/+29
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits) Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown" Cleanup after "QGraphicsWidget is painted twice on the first show" Changed qgraphicswidget autotest to use qWaitForWindowShown. Improved QTest::qWaitForWindowShown on X11. Stabilize tst_QGraphicsWidget::initialShow2 (new test) Make sure we define S_IFDIR on Windows Fix copy/pasto Crash when closing any top-level widget on Symbian. Cache the sizes of the images in an animated GIF. Fix the QAbstractSlider autotest. Use OpenVG scissor on 90/180/270 rotations and simple clips. Optimize single-rect IntersectClip in OpenVG using the scissor QGraphicsWidget is painted twice on the first show. Compiler warning in QAbstractSlider. Optimize QPathClipper::pathToRect. QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible. QStyleSheetStyle: Fix combinaison of border-image and border-radius Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar" Proper Fav icon is not shown, for all the links default fav icon shown Update changes-4.6.2. ...
| | * | Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-5/+29
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Manual resolve of conflict in changes-4.6.2 in staging-2. Conflicts: dist/changes-4.6.2
| | | * Merge commit 'origin/4.6' into 4.6-oslo2Rohan McGovern2010-02-041-4/+13
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.2
| | | * | Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one ↵Olivier Goffart2010-02-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | horizontal scrollbar" This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d. This shown to cause more problem than it solved Also update the changelog Reviewed-by: Thierry
| | | * | Update changes-4.6.2.Samuel Rødal2010-02-031-0/+4
| | | | |
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-031-5/+18
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) Make DSFLIP_ONSYNC part of the default flip flags. Fixed a failure in tst_qgl. 4.6.2 changes Avoids a possible crash when saving the state of a main window Implemented QGifHandler::imageCount(). Fixed compilation of the GL2 engine for OpenGL ES 2. fix whitespace Document that QModelIndex::child does not work for the root item Fixed missing textures in the boxes demo. Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux Assert failure when setting a widget focus proxy as its successor in tab order Fixed garbled 3D Qt logo in the overpainting example. fix crash in Phonon::DS9 backend Don't crash when running Qt on KDE with Oxygen style. Fixes missing update when setting opacity on an item that had opacity 0.0 Avoids missing opacity updates by not propagating the ignoreOpacity flag Cleanup in graphicsitem autotest Adds convenience functions QGraphicsItemPrivate::isOpacityNull Fixed a crash when QPixmaps are destroyed after the ~QApplication. Fix GL texture leaks when pixmaps are deleted ...
| | | | * | 4.6.2 changesTrond Kjernåsen2010-02-021-5/+18
| | | | | |
| * | | | | My changes for 4.6.2Miikka Heikkinen2010-02-041-0/+18
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-8/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| | |_|/ | |/| |
| * | | Updated my changelog entryDenis Dzyubenko2010-02-031-3/+8
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Adding my changes.Carlos Manuel Duclos Vergara2010-02-031-1/+4
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-031-3/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix license headers on these new files (and the generator). Add auto-generated tests for QScriptValue Add changes for 4.6.2 Changelog: Added Designer/uic3 changes for 4.6.2 Revert "Improve raster graphics system performance on Mac." Introduce of QScriptValue autotest generator. Fixed potential crash in mac style Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f ) Remove PrintDialog frame on Mac Fix missing non-unified toolbar margins on Mac Add a warning when there are duplicate aliases in a resource file. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a733444d3be6605552471f047558927495ff62b7 ) Improve raster graphics system performance on Mac. Fixed compile of framecapture, simpleselector for symbian-abld winscw.
| | * | Add changes for 4.6.2Anders Bakken2010-02-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Mostly DirectFB. Reviewed-by: TrustMe
| | * | Changelog: Added Designer/uic3 changes for 4.6.2Friedemann Kleint2010-02-021-1/+6
| | |/
| * | Updated changlog 4.6.2Kurt Korbatits2010-02-021-0/+6
| |/ | | | | | | Added bug 7044 to log.
* | Merge branch '4.6'Thiago Macieira2010-01-212-157/+265
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * Changelog.Carlos Manuel Duclos Vergara2010-01-211-0/+2
| | | | | | | | Adding my changes to the changelog for 4.6.1.
| * Add skeleton changes file for 4.6.2.Jason McDonald2010-01-191-0/+159
| | | | | | | | Reviewed-by: Trust Me
| * Add released version of 4.6.1 changes file for posterity.Jason McDonald2010-01-191-157/+104
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2010-01-181-7/+63
|\ \ | |/
generated by cgit v0.12 at 2024-11-23 00:30:22 (GMT)