summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change name of modifiersMask property to "modifierMask"Eskil Abrahamsen Blomfeldt2009-11-038-49/+49
| | | | | | "modifierMask" is more correct English. Reviewed-by: Kent Hansen
* Remove return type of QState::addTransition(QAbstractTransition*)Eskil Abrahamsen Blomfeldt2009-11-033-23/+36
| | | | | | | | | Returning the input argument in a function can lead to confusion and serves no purpose here. Instead, we'll mirror the API from QMenu::addAction() overloads, where the overload that takes a preconstructed object has a void return type. Reviewed-by: Kent Hansen
* Change name of DoNotRestoreProperties enum to DontRestorePropertiesEskil Abrahamsen Blomfeldt2009-11-033-9/+9
| | | | | | | Using the abbreviated "Dont" is consistent with other negated enum names in Qt. Reviewed-by: Kent Hansen
* Change name of QStateMachine::animationsEnabled property to "animated"Eskil Abrahamsen Blomfeldt2009-11-034-16/+16
| | | | | | | The name "animated" is consistent with naming in Qt otherwise, as in QTreeView::animated and QMainWindow::animated. Reviewed-by: Kent Hansen
* doc: Polish documentation for state machine frameworkEskil Abrahamsen Blomfeldt2009-11-033-66/+93
| | | | | | | Fix some examples and wording, and add some clarification based on comments in documentation review session. Reviewed-by: Kent Hansen
* Protect the OpenVG engine from null QPixmapData objectsRhys Weatherley2009-11-023-0/+24
| | | | Reviewed-by: Sarah Smith
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-0216-79/+511
|\
| * Fixed holes in thick strokes.Kim Motoyoshi Kalland2009-11-021-2/+21
| | | | | | | | | | | | | | | | | | When stroking small paths with a thick pen, it looked like the winding fill rule was ignored. The bug was in the stroke generator which generated paths where the winding number could incorrectly become zero. Task-number: QTBUG-1537 Reviewed-by: Gunnar
| * Minor doc fixes for QGLContext::BindOption.Samuel Rødal2009-11-021-1/+3
| | | | | | | | Reviewed-by: Gunnar Sletta
| * Fixed compiler warning on GCC about empty while statement.Samuel Rødal2009-11-021-1/+1
| |
| * Made QGraphicsEffectSource::draw() use cached pixmap if possible.Samuel Rødal2009-11-021-1/+17
| | | | | | | | | | | | Small optimization for the case where the source pixmap is cached. Reviewed-by: Gunnar Sletta
| * Optimized animated blur radii in the GL 2 paint engine.Samuel Rødal2009-11-023-12/+369
| | | | | | | | | | | | | | | | | | We add an internal cache which keeps four half-scaled versions of the source pixmap at different blur radii, then we simply interpolate between the two pixmaps around the desired blur radius, or between the base source pixmap and the first blurred version. Reviewed-by: Gunnar Sletta
| * Moved Qt::RenderHint back into QGraphicsBlurEffect and added a hint.Samuel Rødal2009-11-028-55/+71
| | | | | | | | | | | | | | | | Added AnimationHint, which didn't make too much sense in a generic enum, so Qt::RenderHint was moved back into QGraphicsBlurEffect as QGraphicsBlurEffect::BlurHint. Reviewed-by: Gunnar Sletta
| * Added strict size parameter to QGLFramebufferObject pool.Samuel Rødal2009-11-022-4/+17
| | | | | | | | | | | | | | The strict size parameter can be used when it's critical that we get the exact size we ask for. Reviewed-by: Gunnar Sletta
| * Optimized graphics effects to not needlessly invalidate cache.Samuel Rødal2009-11-022-2/+9
| | | | | | | | | | | | | | When the effect rect changes we only need to invalidate the cache if the mode is ExpandToEffectRectPadMode. Reviewed-by: Gunnar Sletta
| * Check for null pixmapGunnar Sletta2009-11-021-2/+4
| | | | | | | | Reviewed-by: Trond
* | Better cosmetic pen scaling for beziers in tristroker.Gunnar Sletta2009-11-021-1/+1
| | | | | | | | Reviewed-By: Samuel
* | Fixed test, QGraphicsSourceEffect::pixmap(), caching caused failure.Gunnar Sletta2009-11-021-0/+8
| | | | | | | | Reviewed-by: Samuel
* | Safeguard isNull() pixmaps in bindTexture and remove a compile warningGunnar Sletta2009-11-022-1/+40
|/ | | | Reviewed-by: TrustMe
* Remove partial shader support from QGLShader/QGLShaderProgramRhys Weatherley2009-11-012-185/+6
| | | | Reviewed-by: trustme
* Fix some test failures in the qgl test on 16 bit servers.Trond Kjernåsen2009-10-301-0/+22
| | | | | | | These tests are designed to run in 24 or 32 bit mode, and won't work unless they do.. Reviewed-by: Samuel
* Implement a simple caching algorithm for shader programs.Tom Cooksey2009-10-302-31/+53
| | | | | | | | | | When the number of programs held in the cache exceeds a threshold, the least frequantly used programs get deleted. This also covers programs with custom snippets of code. As a conequence, when a QGLCustomShaderStage gets deleted, any programs using that code will (eventually) be freed. Reviewed-By: Samuel Rødal
* Rename qglEngineShaderSourceCode to qShaderSnippetsTom Cooksey2009-10-302-71/+93
| | | | This patch also adds a "snippetNameStr" helper for debugging.
* Refactor of shader manager to not use partial shadersTom Cooksey2009-10-304-217/+211
| | | | | | | | | This is a first step towards supporting binary shaders. Note: This change will introduce a (rare) leak of shader objects, as the shaders will never be kicked out from the cache (because the cache is still a QList) :-) This will be corrected by the next patch. Reviewed-By: Samuel
* Lazily construct QPixmapData's for null pixmapsGunnar Sletta2009-10-308-38/+75
| | | | Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-308-45/+76
|\
| * Avoid infinite loop when laying out text with unconvertible charsEskil Abrahamsen Blomfeldt2009-10-292-38/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the stringToCMap() fails, it can be because it did not have enough space in the layout, or it can because of other errors. In order to implement "try-again" processing in a simple way, we had an infinite loop which assumed that stringToCMap() would always succeed in the second run (which would be the case if the only possible error was "not enough space".) Since there are other possible failures not related to the number of glyphs, you could easily get into an infinite loop here, e.g. when laying out text that contains the Byte Order Mark. The fix changes the implementation to explictly try stringToCMap() twice at max, and is also how it's implemented in the default qtextengine.cpp. Task-number: QTBUG-4680 Reviewed-by: Trond
| * Added QImagePixmapCleanupHooks functions for enabling hooks.Samuel Rødal2009-10-296-7/+28
| | | | | | | | | | | | | | Better than having to befriend QPixmapData and setting is_cached manually. Reviewed-by: Tom Cooksey
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-3053-634/+1891
|\ \ | |/ |/|
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Johan Sørvig2009-10-3094-846/+22694
| |\
| | * OpenVG pixmap filter classes don't need to be exported.Rhys Weatherley2009-10-301-4/+4
| | | | | | | | | | | | Reviewed-by: trustme
| | * Remove drawCursorImage() from the OpenVG composition helperRhys Weatherley2009-10-302-37/+33
| | | | | | | | | | | | | | | | | | | | | The drawCursorPixmap() function is more efficient and can render the QImage form of the QPixmap directly if necessary. Reviewed-by: trustme
| | * Make it possible to set the OpenVG swap intervalRhys Weatherley2009-10-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The QT_VG_SWAP_INTERVAL environment variable can be used to specify a value for eglSwapInterval(). Task-number: QT-2409 Reviewed-by: trustme
| | * Fix wrong version number in Assistant internal help.kh12009-10-291-0/+0
| | | | | | | | | | | | | | | Task-number: QT-1522 Reviewed-by: kh
| | * do not crashOswald Buddenhagen2009-10-293-5/+34
| | |
| | * Compile fix until configure.exe is rebuilt for WindowsThiago Macieira2009-10-291-1/+2
| | |
| | * Merge branch '4.5' into 4.6Thiago Macieira2009-10-291-0/+2
| | |\
| | | * Plug some autorelease pool leaks.Norwegian Rock Cat2009-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QWidget::setCursor() outside of the event loop causes a memory leak in Cocoa. Adding an autorelease pool plugs it. Merge-request: 1791 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | | * Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from d8a2e52e Merge-request: 419 Reviewed-by: Olivier
| | * | Autotest: add a few more tests for Unicode (IDN) supportThiago Macieira2009-10-291-2/+5
| | | |
| | * | Autotest: add one test that was in the previous implementation but missing hereThiago Macieira2009-10-291-0/+1
| | | |
| | * | Autotest: use example.org and example.netThiago Macieira2009-10-291-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | No need to publicise real sites and email addresses. Also, don't use 8-bit data. C escape sequences are ok.
| | * | Import a new implementation of fromUserInput.Thiago Macieira2009-10-292-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | Imported from http://github.com/icefox/guessurlfromstring Licensed under the 3-clause BSD license by the copyright holder.
| | * | Remove the fromUserInput implementation and tests.Thiago Macieira2009-10-292-128/+46
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Also change the configure.exe to ensure that the necessary new configsThiago Macieira2009-10-291-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | are generated Reviewed-By: Daniel Molkentin
| | * | Add the Qt Evaluation message to the hidden libQtCore.so boilerplate.Thiago Macieira2009-10-291-0/+8
| | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| | * | Part 2 of the Evaluation notice feature, now for QtGui.Thiago Macieira2009-10-293-8/+32
| | | | | | | | | | | | | | | | Reviewed-by: Daniel Molkentin
| | * | Readd the Qt Evaluation timebomb, step 1.Thiago Macieira2009-10-295-1/+585
| | | | | | | | | | | | | | | | | | | | | | | | This is the QtCore part of the timebomb. Reviewed-by: Daniel Molkentin
| | * | Cache a state's parent stateKent Hansen2009-10-293-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractState::parentState() is called heavily by the state machine algorithm. The parent state is obtained by qobject_cast'ing QObject::parent(). qobject_cast() is expensive. This commit introduces caching of the result in order to improve performance. We expect that the cache won't be invalidated much since the parent-child relationship of states usually doesn't change after the state machine is started. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * | doc: Remove \internal tag from QStateMachine::configuration()Kent Hansen2009-10-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is useful for debugging, if nothing else, and has been requested by users. We also refer to it in one of our blog posts, so there's little point in trying to hide it any longer. Reviewed-by: Eskil Abrahamsen Blomfeldt