summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile with QT_NO_DOCKWIDGETOlivier Goffart2010-01-051-0/+2
| | | | Task-number: QTBUG-7133
* Removed temporary QGLWidget created during QGLWidget/X11 initialization.Trond Kjernåsen2010-01-051-2/+67
| | | | | | ..and replace it with a much lighter, internal QGLTempContext. Reviewed-by: Samuel
* Fix test: The bug is now fixedOlivier Goffart2010-01-051-1/+0
|
* Fix auto-test failure on WindowsAlexis Menard2010-01-051-1/+0
| | | | Reviewed-by: Olivier
* QScript: Lookup the native setter from the prototypeOlivier Goffart2010-01-051-1/+9
| | | | | | | | | | | | | | | | Usefull if we have 'native' properties with setter in a prototype This happen if you use a QObject wrapper as a prototype. Use getPropertyDescriptor that look up the prototype in order to know if we have a setter. Note that we cannot relly on PropertDescriptor::isAccessorDescriptor as the Getter or Setter attributes are not necesserly updated correctly when updating properties. (See the workaround QScriptValuePrivate::propertyFlags, and tst_QScriptValue::getSetProperty with object7) Task-number: QTBUG-5749 (also need the previous patch) Reviewed-by: Kent Hansen
* Implement QScript::QObjectDelegate::getOwnPropertyDescriptorOlivier Goffart2010-01-054-1/+164
| | | | | | | This is needed for the fix for QTBUG-5749 that follow Reviewed-by: Kent Hansen Task-number: QTBUG-5749
* fix compilation in GL2 paint engine for WindowsGunnar Sletta2010-01-051-0/+1
|
* Move QGLTextureGlyphCache into it's own fileTom Cooksey2010-01-055-240/+350
| | | | Reviewed-By: Samuel
* (mysql) Add test to the system so it's there for use later.Bill King2010-01-051-0/+38
| | | | | | | The test passes/doesn't fail, but is a useful test nonetheless, so adding it to the testsystem anyway. Task-number: QTBUG-6852
* (ODBC) Handle drivers that return SQL_NO_DATA for exec success.Bill King2010-01-051-1/+6
| | | | | | | | | Most drivers return SQL_SUCCESS when executing a delete statement for example, but FreeTDS returns SQL_NO_DATA, which is technically correct, but doesn't follow the practice of other drivers. Task-number: QTBUG-4896 Reviewed-by: Justin McPherson
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-01-0485-824/+1772
|\
| * Remove QGLShareRegister and transfer its functionality to QGLContextGroupRhys Weatherley2010-01-0410-73/+40
| | | | | | | | | | Task-number: QT-2600 Reviewed-by: Samuel
| * BitsPerSample should default to 1 in TIFF files.Rhys Weatherley2010-01-041-4/+3
| | | | | | | | | | Task-number: QTBUG-6870 Reviewed-by: Lorn Potter
| * Make the ShowDirsOnly option work in QFileDialog.Alexis Menard2010-01-042-0/+71
| | | | | | | | | | | | | | This option was simply not implemented at all so it didn't work. Task-number:QTBUG-6558 Reviewed-by:ogoffart
| * Slight performance improvement in comp_func_SourceOver.Samuel Rødal2010-01-041-1/+4
| | | | | | | | | | | | | | We should check for the fully opaque and fully transparent special cases, like we do in the dedicated image blend functions. Reveiewed-by: Gunnar Sletta
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-042-5/+44
| |\
| | * Introduce new "snapToPixelGrid" flag to GL2 engine for drawTextTom Cooksey2010-01-042-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we're rendering text, the glyphs need to be aligned to the pixel grid otherwise we get strange artifacts. Normally text is drawn at integer coordinates, however it is still possible to have a transform which translates by a non-integer offset. This patch adds a flag to the engine which can be used to snap any translate to the pixel grid. Task-number: QTBUG-7094 Reviewed-By: Kim
| * | fixed typo in qpainter docsGunnar Sletta2010-01-041-1/+1
| |/
| * Make stretchblit an opt-out option in DirectFBAnders Bakken2010-01-043-11/+29
| | | | | | | | | | | | | | | | Certain boards are not support StretchBlit very well. This patch enables them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster engine for stretchblits. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Set serial number in QDFBPixmapData::transformedAnders Bakken2010-01-041-0/+1
| | | | | | | | | | | | | | QDirectFBPixmapData::transformed initializes a new QDirectFBPixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * New lance test for checking aliased vs antialiased renderingTom Cooksey2010-01-042-0/+156
| | | | | | | | | | | | | | | | | | | | | | This test renders various primitives with anti-aliasing both on and off. It then repeats the render at several non-integer offsets. Note: The reference image was generated with the raster engine, which seems to have off-by-one errors on fills when rendering aliased (It seems to ceil the coords rather than round them). Reviewed-By: Trustme
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-0414-164/+152
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Set serial number in QX11PixmapData::transformed Avoid deep QImage copies in the OpenVG paint engine Reset the OpenVG scissor after a native painting call-out Fix configure's error message to report correct OpenGL qmake vars Fix background brush for character format when writing to ODF document. Also delete blitShader & simpleShader in ~QGLEngineSharedShaders fix a memory leak in QGLEngineSharedShaders Fixed QGLWidget::renderText(). Fixes painting artifacts when using CacheBackground in a QGraphicsView. Remove superfluous enable/disable vertex arrtib arrays Track which vertex attrib arrays are enabled in QGLContextPrivate
| | * Set serial number in QX11PixmapData::transformedAnders Bakken2010-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | QX11PixmapData::transformed initializes a new QX11PixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Avoid deep QImage copies in the OpenVG paint engineRhys Weatherley2010-01-042-9/+12
| | | | | | | | | | | | | | | Task-number: QTBUG-7015 Reviewed-by: Daniel Pope
| | * Reset the OpenVG scissor after a native painting call-outRhys Weatherley2010-01-041-2/+11
| | | | | | | | | | | | | | | Task-number: QTBUG-7051 Reviewed-by: Daniel Pope
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-0111-153/+127
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix configure's error message to report correct OpenGL qmake vars Fix background brush for character format when writing to ODF document. Also delete blitShader & simpleShader in ~QGLEngineSharedShaders fix a memory leak in QGLEngineSharedShaders Fixed QGLWidget::renderText(). Fixes painting artifacts when using CacheBackground in a QGraphicsView. Remove superfluous enable/disable vertex arrtib arrays Track which vertex attrib arrays are enabled in QGLContextPrivate
| | | * Fix configure's error message to report correct OpenGL qmake varsMichael Fairman2009-12-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g. QMAKE_INCDIR_OPENGL_ES2 Merge-request: 2279 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| | | * Fix background brush for character format when writing to ODF document.Pierre Rossi2009-12-302-1/+12
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7047 Reviewed-by: Benjamin Poulain
| | | * Also delete blitShader & simpleShader in ~QGLEngineSharedShadersTom Cooksey2009-12-301-0/+10
| | | | | | | | | | | | | | | | Reviewed-By: Trustme
| | | * fix a memory leak in QGLEngineSharedShadersjianliang792009-12-302-0/+8
| | | | | | | | | | | | | | | | | | | | Merge-request: 412 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| | | * Fixed QGLWidget::renderText().Trond Kjernaasen2009-12-303-109/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back and use the GL 1 engine for the renderText() functions. Getting it to work with the GL 2 engine is a futile effort. Making it work with renderPixmap() in the GL 2 engine is not possible at all, since software contexts in general do not support shader programs. Task-number: QTBUG-5002, QTBUG-6931 Reviewed-by: Kim
| | | * Fixes painting artifacts when using CacheBackground in a QGraphicsView.Yoann Lopes2009-12-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when the background cache was invalidated, it was entirely recreated but only the exposed area of the view was repainted in it, causing the cache to be partly empty in some cases. Now the background cache is always fully repainted when it is invalidated. Task-number: QTBUG-6935 Reviewed-by: ogoffart
| | | * Remove superfluous enable/disable vertex arrtib arraysTom Cooksey2009-12-301-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the shader manager takes care of enabling/disabling the vertex attribute arrays for us, the GL2 paint engine doesn't have to do it. This reduces GL state changes within the paint engine and provides significant performance improvements. For a given test case (25,000 3x3px solid rects), the improvement is 67% on desktop (nVidia) and 9% on embedded (SGX). Reviewed-By: Kim
| | | * Track which vertex attrib arrays are enabled in QGLContextPrivateTom Cooksey2009-12-306-5/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GL2 engine (and probably Qt/3D) needs to track which vertex attribute arrays are currently enabled and which are disabled. As this is per-context state, the logical place to track this is in the context and not in the paint engine. This patch also makes the GL2 engine's shader manager enable/disable the appropriate attribute arrays for a given shader program when it is used. Reviewed-By: Kim
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-044-63/+87
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the need to know the service owner when adding/removing signal rules. Use the watched service name list in matching incoming signals too. Change the QtDBus watched service list to a map to its owner. Update debug output to show the connection's ptr and thread
| | * | Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-024-34/+21
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
| | * | Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-021-2/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
| | * | Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-022-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of simply counting how many times we're watching a service, also map a service to its owner. This allows us to provide a faster, cached GetNameOwner too. Technically, this could mean that a service that is started in-between event loops could remain invalid for a longer period of time. I'm not sure this is an issue -- will need some testing in KDE. Task-number: QTBUG-5979 Reviewed-By: TrustMe
| | * | Update debug output to show the connection's ptr and threadThiago Macieira2010-01-021-10/+10
| | | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0116-134/+480
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update the scrolling code of FlickCharm Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Symbian build fix Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) For maemo, do not strip the binaries during the installation. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | * Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| | | | | | | | | | | | | | | | | | Change the behavior of the scrolling so it is more usable on small devices. Add a code path for accelerating the autoscrolling if paning over a auto-scrolling frame.
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-306-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-30 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. Upstream Symbian def files from Qt 4.6. These files define the ABI of QtWebKit on Symbian. * symbian/bwins/QtWebKitu.def: Added. * symbian/eabi/QtWebKitu.def: Added.
| | * Symbian build fixSimon Hausmann2009-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Disable bearer management support in WebKit for builds inside Qt. We can't depend on an external module that depends on what we're building right now :) This is just a stop-gap fix. Reviewed-by: Trust me
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-304-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) Changes in WebKit/qt since the last update: * Disable HTML5 Datagrid * Fix RVCT build
| | * For maemo, do not strip the binaries during the installation.Adrian Constantin2009-12-301-0/+1
| | | | | | | | | | | | | | | | | | The binaries will be stripped during packaging. Reviewed-by: Tom Cooksey
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-3012-15/+255
| | |\ | |/ / | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-2912-15/+255
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-2912-15/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-14 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix JavaScript prompt behavior for empty/null strings. https://bugs.webkit.org/show_bug.cgi?id=30914 The patch is based on the work done by Gupta Manish. In the default implementation of the JavaScript prompt we are using a QInputDialog to get the text and this has one quirk with regard to not entering any text. In other WebKit ports and in Firefox an empty string is returned but in the Qt case it is a null string. Change the API documentation in QWebPage to mention we want to have a non null string but do the fixup in the ChromeClientQt to support existing code. * Api/qwebpage.cpp: (QWebPage::javaScriptPrompt): Change API documentation * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-294-11/+38
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove pointless const's from functions (internal API) Fixes crash when widget with WA_StaticContents child become toplevel.
| | * | Remove pointless const's from functions (internal API)Tom Cooksey2009-12-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is in response to the review for b063135, but was missed from that patch. Reviewed-By: Kim