summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adapt to libpng 1.4.0beta74 API changeBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | | From libpng changelog: version 1.4.0beta74 [August 8, 2009] Changed png_ptr and info_ptr member "trans" to "trans_alpha". Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Qt fails to build with libpng 1.4 betasBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | Qt expects a trans_values member in png_info_struct; this member has been renamed to trans_color in libpng 1.4. Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* fix doc. id maps to QObject::objectName, not QGraphicsObject::setOpacity ;-)Riccardo Iaconelli2009-08-311-1/+1
| | | | | | | Signed-off-by: Riccardo Iaconelli <riccardo@kde.org> Merge-request: 1371 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Update license header for new file from merge requestThiago Macieira2009-08-311-14/+14
|
* Use system-wide proxy settingsDavid Faure2009-08-312-0/+6
|
* Add QNetworkProxyFactory::setUseSystemConfigurationEnabled(true)David Faure2009-08-313-0/+110
| | | | | | | Simply following the system configuration for the proxy used to require writing a QNetworkProxyFactory subclass. The static setter makes this easier, so apps can in one line say "I want to use the system proxy settings". Solution and method name suggested by Thiago.
* Updated lisence headers for QMarginsJens Bache-Wiig2009-08-312-26/+26
|
* Make QMargins a proper classJens Bache-Wiig2009-08-319-162/+596
| | | | | | | | | | Since we need QMargins for other things then the CSS helper functions in drawutil, we have to make it more generic. It is already useful for QWidget::contentsMargins for example. This ensures we have some flexibility on how to use and modify it in the future. Reviewed-by: mbm
* Refactoring qatomic_windows.hJoão Abecasis2009-08-315-323/+345
| | | | | | | | | | | | | | Consolidated Interlocked* declarations and API implementation through macro hackery, (hopefully) for improved readability and maintainability. Fixes anti-aliasing warnings with MinGW in qatomic_windows.h. Gcc builds now use inline assembly for atomic operations, instead of relying on Interlocked* functions which aren't consistently declared across implementations (mingw32, mingw-w64, wine... others?). Drops support for VC 6 and MetroWerks. Reviewed-by: Thiago Macieira
* Fixed initialization order in QGLContextGroup constructor.Kim Motoyoshi Kalland2009-08-311-1/+1
| | | | Reviewed-by: Trond
* Remove unused variable in GL2 engine.Kim Motoyoshi Kalland2009-08-311-1/+1
| | | | Reviewed-by: Trust Me
* Added context pointer to QGLContextGroupResources.Kim Motoyoshi Kalland2009-08-314-126/+151
| | | | | | | | | | | | I renamed QGLContextGroupResources to QGLContextGroup because we are using it to identify context groups. I also added a pointer to one of the contexts in the group. Together with qgl_share_reg(), the pointer can be used to find all contexts in a group. I renamed QGLContextPrivate::qt_get_extension_funcs() to QGLContextPrivate::extensionFuncs() to follow Qt's naming convention. Reviewed-by: Trond
* Minor improvement when parsing matrix transformation in SVG.Ariya Hidayat2009-08-311-1/+24
| | | | | | | Create a specialized version of numbers parsing that works on a short QVarLengthArray since a transformation matrix has at most 6 elements. Reviewed-by: Kim
* Speed-up floating-point decoding for SVG parsing.Ariya Hidayat2009-08-311-4/+11
| | | | | | | | | | | | Instead of comparing the character to '0' and '9', use bit fiddling to detect that the character is a digit between '0' and '9'. Loading tiger.svg (tests/benchmarks/qsvgrenderer) is now 10% faster, going down from 85.3 millions instructions to 77.2 millions. Mostly this is due 46% speed-up in parseNumbersList() function, from 26.9 millions instructions to just 18.4 millions. Reviewed-by: Kim
* Don't show the pad navigator example full screen.Andreas Aardal Hanssen2009-08-311-1/+1
| | | | | | | | This reverts a change added by 6a3de1f5 by mistake (according to the S60 guys). The proper fix may be to add a -small-screen argument, or to run fullscreen on embedded only. Reviewed-by: jbarron
* Removed the obsolete gestures autotestDenis Dzyubenko2009-08-314-1401/+0
| | | | | | Oops, forgot to remove the autotest after rewriting the gestures api. Reviewed-by: trustme
* Fixed a problem with corrupted text in the GL 2 engine.Trond Kjernåsen2009-08-311-0/+1
| | | | | | | Blending should not be enabled when copying the font cache texture into the fbo. It *may* cause artifacts with some drivers. Reviewed-by: Samuel
* Add license headers to lupdate autotest datahjk2009-08-313-0/+123
| | | | The data is essentially random line noise that happens to live in a .cpp file.
* Add auto-activation on show/hide and setParentItem().Andreas Aardal Hanssen2009-08-315-9/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | If you show a child panel of an active panel, the child will now be activated and the parent deactivated. Hiding the child panel will reactive the parent. If the parent is 0, no other panel is activated. Reparenting a panel onto an active panel will also activate the (new) child. Reparenting away does not affect activation in any way. This change also fixes QGraphicsWidget::isActiveWindow(), which returned true for all toplevel widgets (not in a panel/window). This is wrong; either the non-panel items are active, or a panel is active. The correct behavior is the same as calling QGraphicsItem::isActive(). Fixed the autotests (which wrongly tested that both a panel and a non-panel item were active at the same time). This change causes popups (QGraphics{Proxy,}Widget) to deactivate the parent widget. On the positive side this activates the popup, and ensures that the parent regains proper focus when the popup is closed. However it also means the parent widget is inactive while the popup is open, which (e.g.) causes editable combobox line edit cursors to stop blinking. This is to be fixed soon, but the fix is a bit big so we'll do that later. Autotests included. Reviewed-by: Brad
* Fix activation behavior for panels, and add QGraphicsItem::setActive().Andreas Aardal Hanssen2009-08-316-83/+255
| | | | | | | | | Allow delayed activation for more fine grained control over which panels are activated or left inactive when the scene is created. Autotests included. Reviewed-by: Brad
* Faster cut-off when SVG "display" attribute is not explicitly set.Ariya Hidayat2009-08-311-2/+3
| | | | Reviewed-by: Kim
* Speed-up parseCoreNode() for SVG parsing.Ariya Hidayat2009-08-311-15/+37
| | | | | | | | Instead of doing an attribute look-up via QXmlAttributes::value(), we just iterate by ourselves. Thus, we need to carry out the iteration and comparison only once, instead of every call to the said value(). Reviewed-by: Kim
* Fixed rendering bug in blurpicker example with -graphicssystem openglSamuel Rødal2009-08-311-28/+25
| | | | | | | | | | | Made the GL blur filter code slightly less hacky by not reusing the same paint engine for rendering both to the offscreen FBO and to the actual target device. This should make the code less reliant on paint engine implementation details and thus more robust with regards to changes in the paint engine. Task-number: 260402 Reviewed-by: Trond
* Fixed having a QPainter active on several FBOs at the same time.Samuel Rødal2009-08-311-10/+29
| | | | | | | It's insufficient to use a single paint engine to render to all FBOs. If the default engine is already in used we need to create our own engine. Reviewed-by: Trond
* Fix wrong checks in commit fd8ced2f.Ariya Hidayat2009-08-311-16/+16
| | | | | We should use the newly create QStringRef, after all that is the idea of the optimization.
* doc: Fixed several qdoc errors.Martin Smith2009-08-317-8/+13
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-3154-1088/+1224
|\
| * Faster cut-off when SVG composition op is not explicitly set.Ariya Hidayat2009-08-311-2/+3
| | | | | | | | Reviewed-by: Kim
| * Speed-up SVG font attributes parsingAriya Hidayat2009-08-311-33/+26
| | | | | | | | | | | | Use QStringRef operations as much as possible. Reviewed-by: Kim
| * tst_QByteArray failed to build on some platforms.Gabriel de Dietrich2009-08-311-2/+2
| | | | | | | | | | | | Compiler error: hex escape sequence out of range. Reviewed-by: ogoffart
| * Fixed regression in qgraphicswidget test updateFocusChainWhenChildDie.Gabriel de Dietrich2009-08-311-0/+1
| | | | | | | | | | | | | | Oftentimes and depending on your window manager, QTest::mouseClick is not enough to set the focus on a widget. QTest::mouseMove to that widget first. Reviewed-by: ogoffart
| * Group the stroke attributes for 3.5% speed-up in QSvgAttributes.Ariya Hidayat2009-08-311-32/+38
| | | | | | | | Reviewed-by: Kim
| * doc: Fixed several qdoc errors.Martin Smith2009-08-312-0/+17
| |
| * Fixed crash when sharing OpenGL contexts in the GL2 paint engine.Kim Motoyoshi Kalland2009-08-312-46/+155
| | | | | | | | | | | | | | | | | | | | | | Shader objects had a pointer to the context they were originally created in. If the context was destroyed, the shader would (on Windows) dereference an invalid pointer and cause the program to crash. I replaced the context pointer with a pointer to the context group. I also added checks in debug mode to make sure the context associated with the shader shares resources with the current context. Reviewed-by: Tom
| * Use QStringRef in parseVisibility for SVG parsing.Ariya Hidayat2009-08-311-3/+2
| | | | | | | | Reviewed-by: Kim
| * Faster cut-off in SVG parsing when there is no explicit opacity.Ariya Hidayat2009-08-311-0/+3
| | | | | | | | Reviewed-by: Kim
| * Faster cut-off in SVG parsing when there is no transformation.Ariya Hidayat2009-08-311-4/+4
| | | | | | | | Reviewed-by: Kim
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-312-7/+18
| |\
| | * Document some of the new QVariant featureOlivier Goffart2009-08-312-7/+18
| | | | | | | | | | | | | | | | | | Including the befaviour change Reviewed-by: Thierry
| * | Add missing license headers.Jason McDonald2009-08-3121-21/+875
| |/ | | | | | | Reviewed-by: Trust Me
| * Fix duplicate license headers.Jason McDonald2009-08-3122-902/+0
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-311-67/+56
| |\
| * | Change to standard Qt license header.Jason McDonald2009-08-312-36/+80
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-318620-113276/+115067
|\ \ \ | | |/ | |/|
| * | Speed-up parsePen() function for SVG parsing.Ariya Hidayat2009-08-311-50/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to use QStringRef as much as possible and defer any QStringRef to QString until it is absolutely necessary. When loading tiger.svg (tests/benchmarks/qsvgrenderer), the time spent in parsePen() goes down from 1.75 millions instructions to just 0.85 millions. Reviewed-by: Kim
| * | Speed-up parseBrush() function for SVG parsing.Ariya Hidayat2009-08-311-17/+14
| |/ | | | | | | | | | | | | | | | | | | Use QStringRef as much as possible and leave the remaining QStringRef to QString conversion until it is absolutely necessary. When loading tiger.svg (tests/benchmarks/qsvgrenderer), the time spent in parseBrush() goes down from 1.5 millions instructions to 1.2 millions. Reviewed-by: Kim
| * doc: Fixed several qdoc errors.Martin Smith2009-08-312-2/+4
| |
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-311023-13334/+13472
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-312-99/+195
| | |\
| | | * Faster attributes iteration in QSvgAttributes constructor.Ariya Hidayat2009-08-311-99/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use switch/case to give a faster short-cut when comparing strings. Loading tiger.svg (tests/benchmarks/qsvgrenderer) is 3% faster now. This is mostly because QSvgAttributes constructor goes down from 11.04 millions instructions to just 8.54 millions. Reviewed-by: Kim