summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.Trond Kjernåsen2010-02-101-1/+5
| | | | | | | | | When trying to share the internal pbo context with a widget context, the pbo context needs to be created on the same X11 screen as the widget context. Task-number: QTBUG-8047 Reviewed-by: Kim
* Fixed drawing QPixmaps on QGLWidgets on different X11 screens.Trond Kjernåsen2010-02-101-1/+8
| | | | | | | | | | | Don't try to use the texture_from_pixmap extension when drawing a pixmap from one X11 screen onto a different X11 screen in the GL 2 engine. For that to work, the pixmap will have to be re-created on the new screen, which is exactly what the default bind method does (via QImage conversion). Task-number: QTBUG-8054 Reviewed-by: Kim
* Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support.Trond Kjernåsen2010-02-101-0/+3
| | | | | Task-number: QTBUG-8032 Reviewed-by: Kim
* Prevented assert when using drop shadow effect in the GL 2 engine.Samuel Rødal2010-02-101-1/+2
| | | | | | The GL 2 pixmap filter uses Indexed8 images in the drop shadow case. Reviewed-by: Tom Cooksey
* Clarify QFont::rawName() docs.Trond Kjernåsen2010-02-101-2/+3
| | | | | Task-number: related to QTBUG-8038 Reviewed-by: Kim
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-1021-103/+214
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (ODBC) Use wchar_t instead of assuming 2 bytes. 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.
| * (ODBC) Use wchar_t instead of assuming 2 bytes.Bill King2010-02-101-10/+27
| | | | | | | | | | | | On some platforms, especially iODBC, wchar_t is a 32bit value, not 16 Task-number: QTBUG-6928
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-0920-93/+187
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | QListView: fix crash when hiding many of the lasts item in a QListViewOlivier Goffart2010-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | (sqlite) Allow shared cache modeBill King2010-02-092-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-087-23/+82
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | Updated the docs for QPainter::begin/endNativePainting()Trond Kjernåsen2010-02-081-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7661 Reviewed-by: Kim
| | | * | 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
| | | * | Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.Trond Kjernåsen2010-02-081-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-083-10/+41
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-082-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextCodec::codecForName and codedForMib were not reentrant Reviewed-by: Brad Reviewed-by: Denis
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-104-10/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add the download URI for smart installer package to documentation Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053 rename trk -> symbianutils Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b Fixed defect in handling of expose events for Symbian Added qwidget test case which displays a native child widget Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800
| * | | | | | Fixed defect in handling of expose events for SymbianGareth Stockwell2010-02-094-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit bc82db did not correctly handle native child widgets. Consider the case when we have a top-level widget A with a native child widget B. When QSymbianControl::Draw() is called on the control corresponding to B, the following occurs: 1. The inExpose flag is set in B's QWExtra structure. 2. The call to syncBackingStore() results in a call to QWidgetBackingStore::flush(), passing default parameters. 3. Because no target widget was passed to flush(), this function selects the top-level widget (A) as the target for the flush operation, passing A as the first argument of QS60WindowSurface::flush(). 4. QS60WindowSurface::flush() checks the inExpose flag from A's QWExtra structure, finds it to be false, and proceeds to call DrawNow() on A's control. Because QSymbianControl::Draw() uses the default graphics context, this context is shared between controls. This means that the DrawNow() call in step 4 causes a WSERV-10 panic (Activate() called on an already-active) graphics context. This patch moves the inExpose flag from B's QWExtra into A's QTLWExtra, with the result that the call to DrawNow() in step 4 is suppressed. Task-number: QTBUG-7960 Reviewed-by: axis
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-096-65/+91
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Tidy the changes file. Skip the transparent pixels when doing the sourceOver Refactor comp_func_solid_Clear() and comp_func_solid_Source() Add mingw-specific expected failures for JS test suite QNAM HTTP: Forgot to remove a qDebug() QNAM HTTP: Reserve bytes for HTTP parsing Add platform-specific expected failures for JS test suite Skip test that crashes on win32-g++ QNetworkCookie(Jar): fix includes QNAM HTTP: Improve readHeader() of the HTTP reply Add QSKIP to functionEntryAndExit_builtin. QNAM HTTP: Improve parseStatus() of HTTP reply Demo browser: Better handleUnsupportedContent implementation demo browser: Fix the way warnings were (not) displayed doc: Updated deployment OS X requirements for 4.6
| * | | | | | Skip the transparent pixels when doing the sourceOverBenjamin Poulain2010-02-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blending fully transparent pixels take a non-negligible time when webkit use transparent layer. We can avoid that be skipping those pixels since they have no impact on the final result. Reviewed-by: Samuel Rødal
| * | | | | | Refactor comp_func_solid_Clear() and comp_func_solid_Source()Benjamin Poulain2010-02-093-42/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the common code together with a #define. Remove the check for the length from comp_func_Clear_impl and move it to qt_memfill()
| * | | | | | QNAM HTTP: Forgot to remove a qDebug()Markus Goetz2010-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | QNAM HTTP: Reserve bytes for HTTP parsingMarkus Goetz2010-02-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | | | QNetworkCookie(Jar): fix includesPeter Hartmann2010-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to include the module preefix in public headers Reviewed-by: Denis Dzyubenko
| * | | | | | QNAM HTTP: Improve readHeader() of the HTTP replyMarkus Goetz2010-02-091-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Also don't use the obfuscated line ending checking code. Reviewed-by: Peter Hartmann
| * | | | | | QNAM HTTP: Improve parseStatus() of HTTP replyMarkus Goetz2010-02-091-10/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Reviewed-by: Peter Hartmann
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-091-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
* | | | | 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-091-0/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | 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-083-12/+43
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Update Symbian OS def files for 4.6.2Shane Kearns2010-02-082-12/+40
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8024
| * | | | 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
* | | | Fixes qabstractslider autotestDenis Dzyubenko2010-02-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0612-58/+143
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0612-58/+143
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fixes scrolling horizontally with a mouse wheel over sliders.Denis Dzyubenko2010-02-053-27/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling horizontally over sliders the slider should go to the right, which means the value of the slider should increase. However in Qt scrolling with a mouse wheel horizontally means the delta value is negative, which is wrong. So changed the delta to be inversed. Reviewed-by: Richard Moe Gustavsen
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-056-28/+81
| | |\ \
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-056-28/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) Changes in WebKit/qt since the last update:
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-0533-230/+1008
| | |\ \ \ | | | |/ /
| | | * | A fix for accidently reused variable names in nested iterations.Zeno Albisser2010-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | | Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.David Boddie2010-02-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Suggested-by: Robert Griebl
| | * | | Doc: Fixed typo.David Boddie2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-10-24 20:29:03 (GMT)