summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-09263-2969/+475
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed some global QIcon/QPixmap instances that leaked handles on X11. Speed up QListView test QListView: fix crash when hiding many of the lasts item in a QListView Fixed warnings and crash when painting graphics effects outside scene. Stabilize QLineEdit test on X11 (sqlite) Allow shared cache mode Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant. Fixed bug where GL widget was not fully updated on Vista.
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Kim Motoyoshi Kalland2010-02-095-14/+24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| | * Fixed bug where GL widget was not fully updated on Vista.Kim Motoyoshi Kalland2010-02-045-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | There were cases where the QGLWidget would not be fully updated on screen on Windows Vista and Windows 7 with Aero disabled. Task-number: QTBUG-7865 Reviewed-by: Prasanth
| * | Fixed some global QIcon/QPixmap instances that leaked handles on X11.Trond Kjernåsen2010-02-094-27/+46
| | | | | | | | | | | | | | | | | | | | | | | | Never ever create global cache objects that deletes QPixmaps when destructed! Task-number: QTBUG-8046 Reviewed-by: Friedemann Kleint
| * | Speed up QListView testOlivier Goffart2010-02-091-35/+32
| | | | | | | | | | | | (from 31s to 7s)
| * | QListView: fix crash when hiding many of the lasts item in a QListViewOlivier Goffart2010-02-092-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Since 6c1388ee5a3c4796d hidden items are not taken in account when counting the scrollbar position, and so the vector may be smaller. Reviewed-by: Gabriel Task-number: QTBUG-7929
| * | Fixed warnings and crash when painting graphics effects outside scene.Yoann Lopes2010-02-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when an item had a QGraphicsEffect on itself and that item was outside of the sceneRect, the cached pixmap of the item was just an empty pixmap (when using DeviceCoordinates mode). Therefore the effect filter was trying to paint into an unformatted and empty image. Now, paint() for all pixmap filters just return immediatly when the pixmap is empty. Task-number: QTBUG-5358 Reviewed-by: sroedal
| * | Stabilize QLineEdit test on X11Olivier Goffart2010-02-091-5/+4
| | |
| * | (sqlite) Allow shared cache modeBill King2010-02-093-28/+40
| | | | | | | | | | | | | | | | | | | | | This modification is needed to allow performance optimisations necessary for QML. Reviewed-by: Warwick Allison
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-08248-2860/+298
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| | * | Make generate uid3 (symbian) work on 64 bit host platform.Thomas Zander2010-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a 64 bit system the old code used to make; UID "0xEffffffff9d8cb14". Which doesn't get accepted by the symbian tool chain ;) The patch makes this normal size hex uid3 again. Reviewed-by: Miikka Heikkinen
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bjørn Erik Nilsen2010-02-081-5/+18
| | |\ \
| | | * | Updated the docs for QPainter::begin/endNativePainting()Trond Kjernåsen2010-02-081-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7661 Reviewed-by: Kim
| | * | | Compile fix for network benchmarks.Bjørn Erik Nilsen2010-02-083-3/+3
| | | | |
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bjørn Erik Nilsen2010-02-081-0/+1
| | |\ \ \ | | | |/ /
| | | * | Add a pixmap modification hook to blur pixmap filter cacheTom Cooksey2010-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We probably want to kick out filtered pixmaps from the cache when the source pixmap is modified as well as just destroyed. Reviewed-By: Samuel
| | * | | Delete benchmark examples (qtestlib-simple and qtwidgets).Bjørn Erik Nilsen2010-02-0814-2786/+0
| | | | | | | | | | | | | | | | | | | | | | | | | These have no real value anymore now that we have plenty of other benchmarks. They served as examples on how to use the QBENCHMARK macro.
| | * | | Restructure tests/benchmarks directory.Bjørn Erik Nilsen2010-02-08222-47/+114
| | |/ / | | | | | | | | | | | | | | | | | | | | We follow the same structure as used in the src directory. This makes it easier to navigate through the jungel, especially now that we are going to add functional tests etc.
| | * | Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.Trond Kjernåsen2010-02-082-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the compiled in formats where checked when setAutoDetectImageFormat(false) was set on a QImageReader object. Task-number: QTBUG-7980 Reviewed-by: aavit
| | * | QLineEdit: regression: read-only line edits would eat shortcuts.Olivier Goffart2010-02-082-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore Qt 4.5 behaviour. Task-number: QTBUG-7395 Reviewed-by: Thierry
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-085-10/+89
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| | | * | QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.Olivier Goffart2010-02-082-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DataStore could have been destroyed before. Even if having static QGraphicsItem is not really supported, it is better not to crash Task-number: QTBUG-7629 Reviewed-by: bnilsen
| | | * | Make QTextCodec reentrant.Olivier Goffart2010-02-083-9/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextCodec::codecForName and codedForMib were not reentrant Reviewed-by: Brad Reviewed-by: Denis
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0910-44/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed.. fix a few mistakes in German translation Fix Float Conversion in xmlpatterns generate code which does not break QT_USE_FAST_CONCATENATION with old gcc drastically improve load time of TS files
| * | | | | Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-095-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond@trolltech.com> Task-number: QTBUG-8046
| * | | | | fix a few mistakes in German translationFrederik Schwarzer2010-02-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2302 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Fix Float Conversion in xmlpatternsDominik Holland2010-02-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Maemo5 devices there is an automatic conversion to Float. So qtToXDMType() needs a special case. Reviewed By: Peter Hartmann
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-083-19/+33
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: generate code which does not break QT_USE_FAST_CONCATENATION with old gcc drastically improve load time of TS files
| | * | | | generate code which does not break QT_USE_FAST_CONCATENATION with old gccOswald Buddenhagen2010-02-081-1/+1
| | | | | |
| | * | | | drastically improve load time of TS filesOswald Buddenhagen2010-02-082-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it isn't such a good idea to insert rows one by one into the model. so instead batch the "announcement" of new data. unloading single models is still slow, but that's a corner use case, so don't bother fixing it now, especially as it is harder to do it.
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-097-35/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting some parameters to reliably run on Tb9.2, Streamlined smart installer package creation in Symbian
| * | | | | | Setting some parameters to reliably run on Tb9.2,Aleksandar Sasha Babic2010-02-091-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tb 9.2 ATM is more memory sensitive. Reviewed-by: TrustMe
| * | | | | | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-096-35/+56
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added make target for creating smart installer packages - Application sis is automatically generated if missing when "make installer_sis" is invoked - No need to specify installer pkg UID if self signing is enough - Related docs fixed - Fixed smartinstaller.sis name to be correct Task-number: QTBUG-8026 Reviewed-by: axis
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-094-387/+184
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Improve the benchmark of QScriptClass QNAM HTTP: Fix issue with some servers Added QMake directory to INCPATH so the compiler can find required headers Handle Shift+Tab correctly on X11.
| * | | | | Improve the benchmark of QScriptClassBenjamin Poulain2010-02-091-381/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The benchmarks has been stabilised and modified so the number are more representative of QSCriptClass and not other part of Qt: -the "iteration numbmer" has been introduced to ensure a minimal number of call, indpendant of QTestLib. -the subclasses of QScriptClass have been rewritten to have less impact on the results
| * | | | | QNAM HTTP: Fix issue with some serversMarkus Goetz2010-02-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to eatWhitespace() must only be done before reading the status, not while reading it. (We can be in ReadingStatusState for multiple loop iterations) Task-number: QTBUG-7673 Reviewed-by: Peter Hartmann
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-092-4/+24
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added QMake directory to INCPATH so the compiler can find required headers Handle Shift+Tab correctly on X11.
| * | | | | Added QMake directory to INCPATH so the compiler can find required headersConstantin Makshin2010-02-081-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-02-0832-4973/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | oslo-staging-1/4.6
| * | | | | | Handle Shift+Tab correctly on X11.Thomas Sondergaard2010-02-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes incorrect handling of Shift+Tab keysyms. Most typically Shift+Tab generates Shift+ISO_Left_Tab, but VNC clients generate Shift+Tab in accordance with the RFB specification. Merge-request: 458 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-085-17/+53
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Documentation: clarified RVCT support for Symbian Update Symbian OS def files for 4.6.2 Don't remove all dependencies when patching the pkg. Workaround for abld toolchain issue with s60main
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Gareth Stockwell2010-02-082-12/+40
| |\ \ \ \ \ \
| | * | | | | | Update Symbian OS def files for 4.6.2Shane Kearns2010-02-082-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8024
| * | | | | | | Documentation: clarified RVCT support for SymbianGareth Stockwell2010-02-081-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8012 Reviewed-by: Iain
| * | | | | | Don't remove all dependencies when patching the pkg.Miikka Heikkinen2010-02-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only remove dependencies that are known to cause unncessary warnings from pkg files when patching them with patch_capabilities.pl script. Task-number: QTBUG-8018 Reviewed-by: Janne Koskinen
| * | | | | | Workaround for abld toolchain issue with s60mainMiikka Heikkinen2010-02-081-0/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for ARMV6 with abld toolchain in Symbian, qtmain.lib ends up missing some symbols that are required to link it against GCCE apps. This happens because --dllimport_runtime compiler option is missing in ARMV6 builds of qtmain.lib. Task-number: QTBUG-7952 Reviewed-by: axis
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0846-5049/+172
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the installer from the Qt sources. Fixes qabstractslider autotest Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. 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.
| * | | | | Remove the installer from the Qt sources.Thiago Macieira2010-02-0830-4972/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This copy of the installer doesn't work anymore. Reviewed-By: TrustMe
| * | | | Fixes qabstractslider autotestDenis Dzyubenko2010-02-082-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bad merge in the QAbstractSlider::wheelEvent. Modified an autotest to follow a change in behavior - scrolling with a horizontal mouse wheel to the "right" means increasing the value. Reviewed-by: Richard Moe Gustavsen
| * | | | Add a recursive rule for running the auto-tests.Adrian Constantin2010-02-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "make check" to run all the auto-tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
generated by cgit v0.12 at 2024-11-27 17:46:28 (GMT)