summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-022-45/+75
|\
| * Fix for static QSound::play in Symbian and code style fixes.Janne Anttila2009-11-022-45/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static QSound::play(const QString& filename) API did work for Symbian, since local stack variable was deleted before asynchronous play completed. This happened with the following seqeunce: - void QAuServer::play() is called and creates a QSound on the stack - QAuBucketS60::play() is called - m_prepared is false, so the actual play will happen a bit later - The QSound created on the stack is deleted -> Silence This scenario is now fixed by making copy of QSound object to internal list, and temp object is being deleted when play is completed either successfully or unsuccessfully. Added also manual test case for static play. Task-number: QTBUG-5217 Reviewed-by: Miikka Heikkinen
* | Style's theme palette hash is lost after orientation switchSami Merilä2009-11-021-1/+1
|/ | | | | | | | | | | | | Currently, after orientation switch when new theme background is applied, it is done using QApplication::setPalette(). This unfortunately tosses away the palette hash. So instead directly calling QApplication::setPalette(), the fix is to call the style's internal setThemePalette(), which copies the hash also to QApplication palette. This is related to bug QT-1478 in Private JIRA. Task-number: QT-1478 Reviewed-by: Shane Kearns
* Fixed statuspane visibility after dialog closed from fullsreen widget.Janne Anttila2009-10-301-6/+12
| | | | | | | | | | | | | | | - Comparing TBool == bool did not work correctly since TBool is effectively int. For example statusPane->IsVisible() in this particular case returns 2, which compared to true as an int fails. Casting to bool seems to solve the problem. Another possibility would be to use Symbian COMPARE_BOOLS macro. - Changing statuspane visibility now affects to widget size also - Some tab/space fixes Task-number: QTBUG-4876 Reviewed-by: Sami Merila
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-10-304-22/+21
|\
| * Moved a resource file from the static wrapper app to QtGui.axis2009-10-303-20/+11
| | | | | | | | | | | | | | | | | | | | It's more appropriate to have it in QtGui after the framework classes were moved there. This also means that the rsgfix needed earlier is not necessary anymore, since QtGui is not a static library. RevBy: Janne Anttila
| * Fixed namespacing in qatomic_symbian.haxis2009-10-301-2/+10
| | | | | | | | | | | | | | | | | | The namespace needs to be there, even if empty, to avoid warnings. Also, the header declaration was moved to avoid nested header declarations. RevBy: hjk
* | S60Style: User set header view palettes are ignoredSami Merilä2009-10-301-8/+36
|/ | | | | | | | | QS60Style ignores user defined palettes for QHeaderViews. With this fix, style takes palette changes into account and also draws QTableCornerButton correctly. Task-number: QTBUG-4522 Reviewed-by: Alessandro Portale
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-10-3067-1127/+1810
|\
| * Merge branch '4.6-s60' into 4.6axis2009-10-3029-341/+484
| |\
| * | Remove a paintBox call that should have been moved a few lines down, but was ↵Robert Griebl2009-10-301-3/+0
| | | | | | | | | | | | | | | | | | instead copied in commit ea13922 Reviewed-by: TrustMe
| * | Introduce internal StateType to avoid excessive qobject_castsKent Hansen2009-10-307-25/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The state machine algorithm frequently needs to know what type a state is, e.g. if it is atomic, final or a history state. We were using qobject_cast() to determine this, but that function is expensive. This commit introduces an internal StateType to be able to differentiate between the different types of state. This vastly improves performance. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | 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
| | | * | | Make QStateMachine event posting functions thread-safeKent Hansen2009-10-293-17/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By popular demand on the Qt Labs blog. This makes it possible to readily use QStateMachine with e.g. worker threads that post events to the machine. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | * | | Test that we gracefully handle event posting after the state machine is stoppedKent Hansen2009-10-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal slot _q_process() should never be called if the machine is not in the Running state.
| | | * | | Cache QState's child statesKent Hansen2009-10-292-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the same type of optimization as that done for transitions in commit 5d8dcd57cd13fdd9c8643fa3bdda9f197a4351ff. The idea is to avoid calling qobject_cast() because it's very expensive. Obtaining child states needs to be as fast as possible because it's in the critical path of the state machine algorithm; it's called by a ton of internal functions, like isCompound(), isAtomic(), isInFinalState(). It's also called heavily for parallel state groups. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | * | | QStateMachine::event() should call QState::event()Kent Hansen2009-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QStateMachine inherits QState now. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * | | | Fix the combobox popup 1-second fadeout regression on Carbon.Morten Johan Sørvig2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression caused by b946da648af0c5fa1c73fe1e57b0b1e08fb14d13. Prior to that commit, the default duration for macWindowFade was 0, but there was code in the implementation that set it to 0.15 in that case. Set the default duration to 0.15. This matches the old behavior when calling macWindowFade without specifying a duration, and makes it clearer what the default really is.
| * | | | | Made internal FBOs snap to power-of-two when not wasting too much space.Samuel Rødal2009-10-291-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves performance on certain OpenGL ES 2.0 platforms. Reviewed-by: Gunnar Sletta
| * | | | | Got rid of redundant texture parameter settings in GL pixmap filters.Samuel Rødal2009-10-291-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The texture parameters are set in drawTexture anyways. Reviewed-by: Gunnar Sletta
| * | | | | Added some optimizations to the blur and drop shadow GL filters.Samuel Rødal2009-10-298-195/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use ExpandToTransparentBorderPadMode since we can use GL_CLAMP_TO_EDGE to clamp to the texture. * Shrink the bounding rects reported by the blur and drop shadow filters (expanding by 2 * radius isn't needed). * Use a single-pass blur for radii <= 3 to avoid the overhead of rendering to an FBO. * Made the fast blur setting generate filters for only a predefined set of radii, and then use the actual blur radius to spread the sample points outwards. * Optimized the generated program to rely less on temporary variables, as those seemed to not be handled very well by certain GLSL compilers. Reviewed-by: Gunnar Sletta
| * | | | | Fixed highlighting of string components when inputting Japanese text.Kim Motoyoshi Kalland2009-10-291-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After typing a sentence in Japanese, and before committing the sentence, you can select each component and choose a different character representation for it. This commit fixes highlighting of the currently selected sentence component which was broken by commit 55137901. Reviewed-by: Marius Storm-Olsen
| * | | | | Fix bug for message error "Texture updload failed, error code 0x500"Stefano Pironato2009-10-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message come from the QGLContextPrivate::bindTexture. But since OpenGl errors are retains until glGetError is called the actual error was happening somewhere else. After adding in all the gl* call a check for a gl error, I was able to get the place where opengl fail with a GL_INVALID_ENUM. This happen in the call of glEnable(GL_TEXTURE_2D) in the file qgl_x11egl.cpp. This glEnable call does not need: removed. Reviewed-by: Tom Cooksey
| * | | | | Fix raster paintengine handling with invalid imagesChristoph Feck2009-10-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initTexture() has explicit handling of invalid images, but when calling adjustSpanMethods() the invalid case is not handled for Type == Texture. This caused two types of crashes: * call to 0 address, because sourceFetch[] has 0 pointer for QImage::Format_Invalid (see https://bugs.kde.org/show_bug.cgi?id=176014) * division by zero in tiled blend functions, because of the " % image_size" modulo arithmetic. (see https://bugs.kde.org/show_bug.cgi?id=203231) Merge-request: 1213 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-285-11/+22
| |\ \ \ \ \
| | * | | | | Fix QtOpenGL linker issue by exporting qt_getClipRectsThorbjørn Lindeijer2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is used in qwindowsurface_x11gl.cpp. The problem only showed when building in release mode due to previous use of Q_AUTOTEST_EXPORT. Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
| | * | | | | Use shared memory images when shared pixmaps are not available.Fredrik Höglund2009-10-274-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern graphics drivers tend to disable shared memory pixmaps, since rendering operations often can't be accelerated by the GPU when the pixmap data is pinned in system RAM. Use XShmPutImage() to flush the window surface when this is case, instead of falling back to the slower XPutImage() method. Merge-request: 1684 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-2841-210/+20792
| |\ \ \ \ \ \
| * | | | | | | Updated testcase to match new boundingRect logicGunnar Sletta2009-10-281-1/+1
| | | | | | | |
generated by cgit v0.12 at 2025-08-25 21:20:36 (GMT)