summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix crash in QTreeWidgetItem::sortChildren when adding new item.Markku Heikkila2012-02-011-0/+1
| | | | | | | | | | | | | | | | Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and sorting is enbled in QTreeWidget. First call is from user code and second is caused by timer. When timer expires second call is made. This recursion is prevented with QTreeModel::SkipSorting skipSorting() in QTreeWidgetItem::sortChildren(); Task-number: QTBUG-20345 Change-Id: I48af98b03c0291de8da90d1581bc55cc89846b8c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Various Qt documentation fixes (wk 44)artoka2012-01-314-4/+10
| | | | | | | | | | | | | | | | Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Various qt documentation fixes (wk 43)artoka2012-01-313-5/+9
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12389 Task-number: QTBUG-16667 Task-number: QTBUG-6151 Task-number: QTBUG-8625 Task-number: QTBUG-19808 Task-number: QTBUG-12096 Task-number: QTBUG-1231 Task-number: QTBUG-21073 Task-number: QTBUG-8939 Task-number: QTBUG-20399 Task-number: QTBUG-20944 Task-number: QTBUG-7542 Task-number: QTBUG-22095 Task-number: QTBUG-11278 Task-number: QTBUG-15653 Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fixed EGL build for WEC7jaanttil2012-01-311-1/+1
| | | | | | | | Task-number: QTBUG-22504 Change-Id: I4a88a76f208e7040ff941651973591d30bff30d6 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed QEventDispatcherQPA::processEvents()Rafael Roquetto2012-01-311-3/+2
| | | | | | | | | | | | | | | | | | QEventDispatcherQPA::processEvents() calls QEventDispatcherUNIX::processEvents() twice in a row. Before the first call, it processes gui, posted events, input events and so on. It then calls QEventDispatcherUNIX::processEvents(), which will eventually drain the thread_pipe. If events are added by a second thread to the event queue, right after select() returns but before the thread_pipe is drained, once the program enters the second call to QEventDispatcherUNIX::processEvent(), select() will block, because the thread_pipe is empty, but the events will be stalled on the queue until something else causes select to return, because they are not handled between these two calls. Change-Id: Ie9a74573559feff6480b630abc237a8e5c89484b Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fixed qapplication_win.cpp build for WinCEjaanttil2012-01-311-1/+1
| | | | | | Change-Id: I206fbb5e137676bb56d251870928826876dc2bb2 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Build fix to qapplication_win.cpp when QT_NO_GESTURES is usedjaanttil2012-01-311-1/+1
| | | | | | | | Task-number: QTBUG-22501 Change-Id: Ica63ad7de763d9abeff7f8e76ad45f90f04db75b Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Removed unnecesary dependency to winx.h from desktopservices for WinCE.jaanttil2012-01-301-3/+0
| | | | | | | | | The winx.h header is not needed to build qdesktopservices for WinCE, it just addional dependency to one optional WinCE module and thus makes it harder to build minimal WEC7 image for Qt purposes. Change-Id: I592577b2af379b7b5d984e27b266b6581eb10e88 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Various Qt documentation bug fixes (wk 42)artoka2012-01-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* blitter: Base QBlitterPaintEngine on QRasterPaintEngineHolger Hans Peter Freyther2012-01-273-117/+151
| | | | | | | | | | | | | | | The original intention was to identify a clipping bug, it turns out that during a ::begin() (and systemChanged) we should forward the QPaintEnginePrivate state to our proxy engine. Instead of using the proxy-pattern subclass rasterengine and specialize the paths we are able to accelerate using the blitter interface. This will avoid similiar problems in the future. I have no performance measurement to show which of the two approaches is faster/slower. Change-Id: I5ee0de566f4568103f741af697bdabbb097927e4 Based-On: I39bff11b32b1fe20284c7e8df60050de5991bb6e Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Group code by functionality in header and cpp fileHolger Hans Peter Freyther2012-01-272-120/+118
| | | | | | | | | | | * Group code responsible for tracking the render pipeline state to check if we can easily accelerate it * Code that will call into the QBlittable * Code that will lock the QBlittable before calling into raster Change-Id: I759a1864967d92a4cdd48c29941cb20d36afd84f Based-On: I862e242d59805de5094ed363b486afcdbc23ff78 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Fix the 'solid' detection for the brush in case of fillRectHolger Hans Peter Freyther2012-01-271-2/+2
| | | | | | | | | | | | A default QPainter will set a QBrush with Qt::NoBrush BrushStyle, the current code detects this as a non solid fill and all calls with fillRect and a color will not go through QBlittable. Check for Solid or NoBrush style. Manually verified that a p.fillRect(rect, Qt::red) goes through the accelerated path now. Change-Id: Ie53abf0a7ba349ba70742a94086708aca0beaa37 Based-On: Ic0d98030e94f5d11abbe61628fbf71d1e08219c2 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Move state updates into new methodsHolger Hans Peter Freyther2012-01-271-45/+86
| | | | | | | | | | Create updateCompleteState(QPainterState*) so we don't need to call into the paintengine, move all state methods into the QBlitterPaintEnginePrivate class. Change-Id: Ia621aeb9dba98152503f14d8900cf57b5bf2d4f9 Based-On: If30fdcc3f63755e0443bced7d9d9fb993d4ec2b7 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Move the definition out of the class declarationHolger Hans Peter Freyther2012-01-271-59/+68
| | | | | | | | | Cosmetic change to remove four spaces of indention from some of the more deeply nested methods. Change-Id: I9f09a0ce65d74d6dab59a293bb7fb172a5e47aef Baed-On: I67fdd0ab722b7c7c67c4da7a0a0bd86459751700 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Kill the isBlitterLocked variable of theHolger Hans Peter Freyther2012-01-273-11/+11
| | | | | | | | | | | It starts with being initialized wrongly, the call to buffer() will lock the data while we think it is not locked, it can also get out of sync by someone calling buffer() again. Remove the variable and check with the QBlittable if we need to lock the resource into memory. Change-Id: I6d7b336ed2e272724ec5b1348b410cbc4452422f Based-On: I350375011138d1b4c2c48c100b7b30b8ea2ae460 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Use CapabilitiesToStateMask as a class memberHolger Hans Peter Freyther2012-01-271-30/+29
| | | | | | | | | | Move the bit helper functions into CapabilitiesToStateMask as they are only used in this class, allocate the class as part of the QBlitterPaintEnginePrivate, shorten the name as well. Change-Id: Ifab7905d7e240b7c9f08ac5e3421a632b6fe2249 Based-On: If22ddd117a9789cd98edb08f23fd0ffabb17d5a5 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* blitter: Style changes to the codeHolger Hans Peter Freyther2012-01-271-77/+64
| | | | | | | | Attempt to follow Qt style guidelines. Change-Id: I53d3e93eab615e2b8b705698eb87a8d2636723ec Based-On: I3298c8d41d40ab5b0153a33d44b1b607a2edca8e Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Catch exceptions inside QSymbianControl::DrawJaakko Helanti2012-01-252-1/+16
| | | | | | | | | | | | | Code added to catch C++ exceptions and Symbian leaves inside QSymbianControl::Draw. This is a cosmetic fix to remove CONE 6 crashes currently in Symbian port. We'll still study the root cause of those crashes. Task-number: ou1cimx1#952828 Change-Id: I7b62309dd205d3b5dbad3d5477b47451dd7ff397 Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix set/paperSize(QPrinter::PaperSize) on MacAndy Shaw2012-01-251-2/+2
| | | | | | | | | | | | | This fixes the paper size setting on Mac as it would not return the same paper size that was set with setPaperSize() when calling paperSize(). Test is included. Task-number: QTBUG-20882 Change-Id: Ib0064dd40de147d6db2424cdb31021e66894cc37 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Send text selection changes for accessibility.Frederik Gladhorn2012-01-251-0/+3
| | | | | Change-Id: I3c50510ae9f995101d6e2c977c5138713389d71e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Add a public API for releasing cached GPU resources on SymbianGareth Stockwell2012-01-252-0/+13
| | | | | | | | Task-number: ou1cimx1yyy964181 Change-Id: I2f24d1d0f988bfe029e24fd29d59e6421301b670 Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Activate window when focus is set in QAccessibleWidget::doActionJosé Millán Soto2012-01-201-5/+8
| | | | | Change-Id: Iebdabb30c83d4712ad75ec62ce35b4afc382b613 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Cleaning logClusters for line separator layout shortcutJiang Jiang2012-01-181-1/+3
| | | | | | | | | | In some cases the logClusters are accessed, but we don't have actual glyphs generated for them. Task-number: QTBUG-23704 Change-Id: I719c183e17429941b32dd37bf8a4e5497edda6fe Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Handle closable tabs in QAccessibleTabBarJosé Millán Soto2012-01-181-0/+2
| | | | | | | | | | Tab information was hidden by the closing buttons. Closing is implented by using doAction and actionText methods, as it's not possible to use QAccessibleActionInterface to send actions to child widgets in complex widgets. Change-Id: I0f55d5084737fa13c81df402f5dd54f11e164f8a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix cursor disappearance in QLineEdit on Mac when deleting all textPasi Matilainen2012-01-171-1/+1
| | | | | | | | | | On Mac OS X, if all text in the QLineEdit was selected and then deleted, cursor visibility was not updated, and so the cursor remained hidden. Fixed to update cursor visibility also when the text is empty. Task-number: QTBUG-13169 Change-Id: Id52a20b07bb96609a78c42eb630ee2b20ed7cbcb Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix CJK punctuation input through input methods in OS XJiang Jiang2012-01-171-1/+7
| | | | | | | | | | In this case these string are not input through a composing process (no marked text is set) but they should not be handled by Qt key event handler. Change-Id: I9ea96c29db69d51abc6821e72a3228158012bebc Task-number: QTBUG-23216 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix for player application exit crashSatyam Bandarapu2012-01-132-2/+12
| | | | | | | | | | | | | | | | Crash is a regression from the commit 7cd29ef169b94b0182b4207b37715f7427e4e4d6. The commit 7cd29ef169b94b0182b4207b37715f7427e4e4d6 creates two fep contexts, another one is created while first one being created. When application exit, other fep context is deleted after coeEnv destroyed. Fep context destructor uses method from coeEnv and when second fep Context deleted application crashes. To fix the crash, flaged fep context creation while being created. Change-Id: I3079179df2c3a59a0117d5de775116e06d7e3cff Reviewed-by: Satyam Bandarapu <ext-satyam.bandarapu@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Recovering from draw failures after EGL surface creation failuremread2012-01-133-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt drawing system is not designed to handle failures in beginPaint and endPaint. But the Symbian port is creating EGL contexts and surfaces on demand in these functions. These can fail, eg in the defect reported the app gets a visibile=true event for such a short period that it fails to create the surface before it is invisible again. These failures have to be coped with. Brush image drawing is failing if the app is asked to draw while in the background, because the EGL surface cannot be created. After this, if the app comes to the foreground at the wrong time, the failed drawing is shown on the screen as a flat colored area. A failedToAlloc variable in the openvg paint engine was locking in this failed drawing, so that it would never redraw. This is fixed by removing all use of that variable. Failed surface creation during a draw in response to a visibility change event was also leaving the window backing store with bad content. This is now cleared on a surface creation failure so that drawing is retried when the next visibility change event arrives. The retry mechanism for creating a surface on failure also makes the problem circumstances more likely to occur and can block the app unnecessarily. Now, instead of blocking for 1 second every time on failed surface creation, it only blocks on the first failure in a sequence thereby allowing other parts of the app to run freely while it is in the background. Task-number: ou1cimx1#951921 Change-Id: I1e27746957ff624b0d9a1cdc9b319d0a3477135d Reviewed-by: Gareth Stockwell <gareth.stockwell@accenture.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix using custom paper sizes on MacAndy Shaw2012-01-131-3/+5
| | | | | | | | | | | | | | This solves the bug with using custom paper sizes on Mac, if a QSize was specified then with a Unit it would not respect this on Mac as it would not convert it correctly. Also paperSize() would return the wrong value. There is already a test for this in tst_QPrinter::testCustomPageSizes() Task-number: QTBUG-18723 Change-Id: I47c0cf2dd48ea3e0daa3b748f337ec38714aaf34 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111249-1250/+1250
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-226-6/+6
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian: Fix exporting and importing of some functions for autotests Symbian: Fix SRCDIR usage in qlayout autotest. Symbian: Fix qcssparser autotest Symbian: Fix qscriptextensionplugin autotest
| * Symbian: Fix exporting and importing of some functions for autotestsMiikka Heikkinen2011-12-216-6/+6
| | | | | | | | | | | | | | | | | | Symbian builds seem more strict about properly declaring exports than other builds, so added proper exporting and importing to some function declarations. Task-number: ou1cimx1#957184 Reviewed-by: mread
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-12-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix crash in positionInLigature
| * | Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Check boundary of pos before accessing attributes. Task-number: QTBUG-23104 Reviewed-by: Eskil
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-204-30/+47
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77 Fix m_longTapDetector causing crash. Fix to incorrect ApplicationActivate event in QtOpenGL Symbian - Fix QFile::map with non page aligned offsets
| * | Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77Jani Hautakangas2011-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | Forgot to amend commit before pushing, sorry. Task-number: QTBUG-23252 Reviewed-by: TRUSTME
| * | Fix m_longTapDetector causing crash.Jani Hautakangas2011-12-191-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL shared widget calls null poiter m_longTapDetector. These call shouldn't happen because GL shared widget isn't part of UI stack anymore. This patch adds null pointer checks Task-number: QTBUG-23252 Reviewed-by: TRUSTME
| * | Fix to incorrect ApplicationActivate event in QtOpenGLJani Hautakangas2011-12-163-27/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEvent::ApplicationActivate is sent incorrectly when application goes to background if OpenGL graphics system is used. The problem is that hidden global shared QGLWidget used by QtOpenGL for root context is added to CONE stack. Qt destroys shared GL widget when application goes to background and underlying CCoeControl is removed from CONE stack which causes CONE to handle stack changes. CONE tries to focus next control in stack which causes incorrect focus events in Qt leading to ApplicationActivate event. GL global share widget must not be added to CONE stack because it's hidden utility widget and don't belong to UI widget stack. Task-number: QTBUG-23195 Task-number: ou1cimx1#946477 Reviewed-by: Murray Read
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-161-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian: fix tst_QMenuBar::task256322_highlight() regression
| * | Symbian: fix tst_QMenuBar::task256322_highlight() regressionSatyam Bandarapu2011-12-151-0/+2
| | | | | | | | | | | | | | | | | | | | | This fixes Symbian-only regression caused by ab0a2466d7e3998caad226197355b729f523764a. Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-12-154-23/+32
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-141-2/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Default to QDir::homePath() in Symbian native file dialogs Fix NTLM authentication with email address Fix null pointer dereference in NTLM authentication
| | * Default to QDir::homePath() in Symbian native file dialogsGareth Stockwell2011-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian places restrictions on the directories in which the native file dialog can browse. If the path passed to QFileDialog::getXxxFileName() is inaccessible, the implementation defaults to a path which is accessible. Previously, this default path was QDir::rootPath(). Changes to the Symbian file engine in Qt 4.8 mean that this now returns "C:\" which is inaccesible to the file dialog. This patch changes the default path to QDir::homePath(), which returns "C:\data". Task-number: ou1cimx1#947939 Reviewed-by: Miikka Heikkinen
| * | [blitter] Work on tst_QPixmap::clear()Holger Hans Peter Freyther2011-12-132-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default QPixmap may not hasAlphaChannel(), only if setMask() or fill() with a transparent color is called a QPixmap will hasAlphaChannel(). Make the QBlittablePlatformPixmap remember if there is an alpha channel, pass this as parameter in createBlittable to make it clear that this is required and not optional. Update the DirectFB plugin to handle this parameter to create a RGB32 or ARGB Surface depending on the alpha value, also only use PreMultiplied alpha when using ARGB. Separate the two constructors for the QDirectFbBlitter to either adopt a DirectFB Surface or to create one. Cherry-picked-from: qtbase:ab50b60f5cc237d5620f3ff3b2eb44c857f8f60b Change-Id: I8abf82408ecd2d075fc6f241ace8be2a34ac56e7 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | [blitter] Use QScopedPointer for the engine and blittableHolger Hans Peter Freyther2011-12-132-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the QScopedPointer to prevent memory leaks, right now the code appears to be sound but make it more clear that calling ::setBlittable will destroy the old one. Cherry-picked-from: qtbase:dc4764229a3eef5c0bdbd665f2e24e59398e8c51 Change-Id: Idc71add7cfd429ff5b9d0ea9908d9fff1e7ce74d Merge-request: 59 Reviewed-on: http://codereview.qt-project.org/5243 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | [blitter] Generate a new serial number when resizing theHolger Hans Peter Freyther2011-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raster pixmap is generating a new serial number when the pixmap is resized, do the same for the blitter code. Cherry-picked-from: qtbase:6e13586d8b6d80ab374197649c76e7f0b35045db Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | [blitter] Fix memory leak in the blitter paintengineHolger Hans Peter Freyther2011-12-131-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raster engine and the capabilities were leaked, use the QScopedPointer to prevent that from happening. Cherry-picked-from: qtbase:d5f12b898b8480c891382c54672422c50218751a. Change-Id: I31ba0117280b48ad942fbb638fb151ccb7b34385 Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | Fix Memoy leak relateded to contextmenu.Debao Zhang2011-12-131-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | From Qt4.7 on, the contextmenu of QTextEdit/QPlainTextEdit/QLineEdit/QLabel/QMainWindow etc using QMenu::popup() instead of QMenu::exec(), but the setAttribute(Qt::WA_DeleteOnClose) does not work, as QMenu::close() isn't called when the menus disapper. And this causes a memory leak. Task-number: QTBUG-22817 Merge-request: 2721 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-121-8/+18
|\ \ | |/ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix window surface config on OpenGL graphics system. Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS Symbian: Fix double deletion of selected text when using predictive
| * Symbian: Fix double deletion of selected text when using predictiveMiikka Heikkinen2011-12-091-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | The selected text replacement was done incorrectly, leading to removal of additional text equal to the lenght of the original selection. Fixed by not doing any explicit replacement, but instead faking a preedit character that is immediately removed, which triggers selected text removal in the input method handling of the underlying edit control. Task-number: ou1cimx1#938665 Reviewed-by: Sami Merila
generated by cgit v0.12 at 2025-04-07 05:47:04 (GMT)