summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Use BPS based event handlingKevin Krammer2012-05-034-0/+207
| | | | | | | | | | | | | | | | Create a QPA specific subclass of the blackberry event dispatcher (basically the BPS equivalent to QPAEventDispatcherGlib or QEventDispatcherQPA. Create an event dispatcher event filter that will receive all BPS events and then either handle them itself or delegate to event subtype specific handlers. Backport of fa94f01489611f2c72d1678b4d9439a584e7c4f9 Change-Id: Ie51c064c5ef1faca04e09a4f7ff35069ff6afda5 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Compile on Mac OS X with unsupported/macx-clangBradley T. Hughes2012-04-271-1/+1
| | | | | | | | Clang does not allow implicit const to non-const conversion like gcc does. Fix this. Change-Id: I1448975e1935a54405c20851841f0559c7bb9d3d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Moved qmljs_debug_arguments to QCoreApplicationRafael Roquetto2012-04-202-10/+0
| | | | | | | | | Enable the use of the QML debugger without QtGUI Based on Qt5's 9a096d9e. Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* widgets/qpa: Fix painting to a fully transparent top level widgetHolger Hans Peter Freyther2012-04-161-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | QWS used to have a line to change the composite mode from SourceOver to Source for the top level widget. This wasn't used with QPA and I removed the internal DontSetCompositionMode in qtbase. It turns out that the QWS way is the most efficient one to initialize the background of the widget. The alternative is to have the QPlatformBackingStore::beginPaint always clear the entire to be painted area and then paint the background of the widget. The difference of painting each pixel once or twice is noticable on embedded platforms and in the range of one to two fps. This does come from Qt5. The change removes the hasFeature test as CompositionMode_Source is available for all backends. Reproduce the issue with: echo "QWidget {background: transparent}" > style.css ./examples/widgets/wiggly/wiggly -stylesheet style.css Task-number: QTBUG-24526 Change-Id: I3e3f8a263cd3cf9dec8628ca8a3bb28c70572121 Original-Id: Ica4c980bb3bf6eb87ddb5b510ac7493292d01543 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Ensure that the IME composition is handled correctly on MacAndy Shaw2012-04-121-3/+8
| | | | | | | | | | When the language menu was shown while IME composition was underway, it would cause the composition text to be in an invalid state. Task-number: QTBUG-25107 Change-Id: Iaf06f330fb055e30c25ccc9874f15132ea000bc2 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Widget created with type to Qt::ToolTip should have a drop shadowKatja2012-04-121-1/+1
| | | | | | | | | | When using Qt::ToolTip window flag, CS_DROPSHADOW style should be used Task-number: QTBUG-13276 Change-Id: I4b8dfab0de38667188efe6cc8e1465bdf1ae2d18 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Plug memory leak when gestures are grabbed but never triggeredAndy Shaw2012-04-101-93/+91
| | | | | | | | | | | | | | When a gesture is grabbed by QAbstractScrollArea but never triggered then the deletion of the QAbstractScrollArea would mean that the gesture created for it would not be deleted. This ensures that it always deletes the gestures waiting to be deleted even if no gesture event is triggered Task-number: QTBUG-25011 Change-Id: I36118b82baaa60ac4e014896159060e1af76b2d2 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 3ec88b355b5c9649d128fcf18cb2abc39ac0e770)
* Fix compilation error on Solaris caused by ShapeInputIikka Eklund2012-03-301-0/+2
| | | | | | | | | | | | | Change: Icb2204a50a97e4a5e02e75301c67287525b290ba caused build error on Solaris as ShapeInput and ShapeBounding types are not present in default system headers. This patch is compile time fix for Solaris only. On Solaris the windowInteractsWithPosition function call is omitted as suggested by the author of the original change. Task-number: QTBUG-24653 Change-Id: I29d821867ec41e7d68b5bdc126f255dc682cc983 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix window focusing problem in SymbianPauli Jarvinen2012-03-301-1/+1
| | | | | | | | | | | | | | | | | The application window didn't receive focus properly on Symbian when minimized window was maximized. This was because the code first tried to set the focus and then made the window visible. However, invisible window doesn't accept focus, so the visibility should be set first and focus only after that. Not having focus properly set caused software input pane to fail to start in the Camera application, as was reported in the error case ou1cimx1#989756. Change-Id: Id659662e7d92205321746ed5a226843382a6ac89 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fixed a possible crash in Qt CocoaThierry Bastian2012-03-261-4/+8
| | | | | | | | | | | | | | Task-Number: QTBUG-24334 This patch is not dircetly from me but was posted on https://bugreports.qt-project.org/browse/QTBUG-24334. I'm definitely affected by it. Change-Id: Ieb23a7022417188b3885dcb5467affdef71c194f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Ivan Komissarov <ABBAPOH@nextmail.ru> Reviewed-by: Andrew Semenenko Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Hang on to the correct screen index in QWidgetNick Ratelle2012-03-121-0/+1
| | | | | | | | | | | | Hang onto the screen index that this widget should be placed on in case the platform cannot move the window onto the screen yet, when window is not yet created and the plugin cannot access the topData to update the screenIndex. When this variable is later referenced after the window is created, it defaults to screenIndex 0, so the window is never moved correctly. Change-Id: Ica78fd90aa3dacc29f81b2f6bd6c8b45d2fb2961 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Support changing locales at runtime in QPA plugins.Nick Ratelle2012-03-125-2/+31
| | | | | Change-Id: Id65798b81db2fa9fb5b1d929e4a94103995c6707 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* qpa: Don't force event handling every secondEike Ziller2012-03-061-1/+2
| | | | | | | No need to wake up the CPU if we know that nothing happened. Change-Id: I95a26fa4869d9f694729d71c1bc6947f477cc283 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Correcting fixed native orientation translation for touch pointsMurray Read2012-03-062-10/+13
| | | | | | | | | | | | | | | | | | | | | | | For a symbian application using fixed native orientation held in landscape, touches starting from the top of the screen were ignored. This was caused by an off-by-one error when reflecting touch positions. For example a touch in the range 0..359 could be mapped to the range 360..1. And since 0 mapped to a value outside of the valid range, touches starting with that were ignored. The same translation function is used for both touch points and rectangle coordinates, but these use different meanings for a point. For a touch, a point is the centre of the touched pixel, so translations should be against the last pixel, which is at size-1. But Symbian TRect points specify the edges of pixels, and these should be translated against the edge of the screen, which is at size. So the function now takes a parameter describing the type of translation required. Task-number: ou1cimx1#982747 Change-Id: I7af10b3a5b9b8658db9af8fa9bc04ad9cb531588 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
* Fix incorrect state of show/hide menu items in Mac application menuPasi Matilainen2012-03-042-0/+13
| | | | | | | | | | | The "Hide <app>", "Hide Others" and "Show All" menu items in Mac application menu are always enabled, and do not get disabled correctly. Fix by turning on autoenable for the menu in qt_menu.nib, and by implementing menu item validation in QCocoaMenuLoader. Task-number: QTBUG-10705 Change-Id: Ic181dfa26a71acad0067f5269c72517b50b17362 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed Windows performance regression introduced by ac2818bef95f134.Samuel Rødal2012-03-021-2/+7
| | | | | | | | Only create a temporary DC if we're not on the main thread. Task-number: QTBUG-24602 Change-Id: I36dad4c197c7cc1e019b19d42c81526fc8cfdcf4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix window positioning regression.Miikka Heikkinen2012-02-281-2/+2
| | | | | | | | | | | | The fix to bug QTBUG-10589 has affected the style flags of windows, which indirectly changed how their initial position is determined. Fixed initial position for windows with WS_POPUP style so that x and y cannot go negative, which makes QMainWindows with larger than screen initial dimensions to behave identically to Qt 4.7.4. Task-number: QTBUG-24071 Change-Id: Ie38cdd206df4be21cce823d7d94a4690a7cb01e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Take into account input shaping in findRealWindowAlbert Astals Cid2012-02-213-26/+19
| | | | | | | | | | | | | | | In previous commits we took into account bound shaping, but X also supports input shaping, so make sure it's inside both input and bounding shaping to consider the position as inside a window My tests show that when unset Bound Shaping and Input Shaping return the rectangle of the window itself, so we need to be inside both of the rectangle sets to consider the position as a dragabble position for the window Change-Id: Icb2204a50a97e4a5e02e75301c67287525b290ba Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed memory leak in QPA/Lighthouse event handling.Samuel Rødal2012-02-141-0/+1
| | | | | | | | | | | | The WindowSystemEvent class needs a virtual destructor, or sub-classes with non-POD members will leak memory and their member's destructors don't get called. This is a backport, the bug was already fixed in Qt 5 as 4ab6860172e14b0047e56ab. Change-Id: I2766fcea955a6cbc7613b717c76e13674943d6a9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Build break fixAri Lehtola2012-02-141-1/+2
| | | | | | | | | | Public SDK breaks because of missing definition of GfxTransEffect in commit Ia8d0544ec30741605efd6f7db035bcea2f36e67a Symbian specific flag added Change-Id: I972bf207d7854be1bc77bba6ae4ef8155279b1b3 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Raise loopLevel for deleteLater in event filtersJohn Stanley2012-02-101-11/+0
| | | | | Change-Id: I163f510f6e99d86a35cc78965fa383e7f4618f42 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* When doing mouse move compression, pass non-MotionNotify events to installed ↵John Stanley2012-02-101-1/+4
| | | | | | | event dispatcher event filters Change-Id: Ia71f23458b9a6bc728f3e05592f530e317ae453c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Pass events to installed event dispatcher event filters before passing them ↵John Stanley2012-02-103-13/+25
| | | | | | | | | | | to x11ProcessEvent() Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd Pass events to eventFilter first Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix crash in qt_init when the XFIXES extension is not available.David Faure2012-02-101-0/+8
| | | | | | | | | | | | This happened to me when starting a Qt4 application in VNC (vncserver, vncviewer -via host, on linux). The pointers to the xfixes functions were not being set to 0 when XFIXES is not available, so it would crash later on in the method, in the (null-checked) use of X11->ptrXFixesSelectSelectionInput. Change-Id: Icbeec16e211790ea9d8ebe7e2d96c7a8021214cd Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix for effects in Qt-applications startupAri Lehtola2012-02-081-0/+7
| | | | | | | | | | | This is part of the solution for reducing flickering in Qt-applications startup. Fix is effective together with changes in platform effects framework. Task-Number: ou1cimx1#951526 Change-Id: Ia8d0544ec30741605efd6f7db035bcea2f36e67a Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Prevent crashing on Symbian in case EGL surface creation fails.Pauli Jarvinen2012-02-082-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible in environment with limited resources, that EGL surface creation fails. When this happens, the QPainter doesn't get properly activated, which in turn caused a crash later in the drawing code. Now, a check has been added into qapplication_s60.cpp to abort window drawing immediately, if surface creation has failed. The EGL surface is then tried to be recreated on the next time when the window becomes visible, which usually allows the application to recover. In most cases, the crash happened in the function qDrawBorderPixmap, which didn't check the validity of the QPaintEngine pointer before accessing it. This method is analogous with the public methods of the class QPainter where, on the other hand, availability of QPaintEngine was always checked. To be in line, and to prevent ptential crashes, a similar safety check and warning message have now been added to method qDrawBorderPixmap. Furthermore, a null-check was added to qwindowsurface_gl.cpp for the QGLContext pointer. The same pointer was already previously null-checked in the other branch of the same function, indicating that the null-check is probably necessary. Task-number: ou1cimx1#969923 Change-Id: I6d78be72b9c2308ef74b1119d8c8ec34ec015195 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Don't get stuck in a loop while trying to close the active popup widgetAndy Shaw2012-02-081-1/+1
| | | | | | | | | | | When the application is deactivated then it will try to close down the active popup widget. However, the popup widget can prevent a close from occuring and Qt should respect this without causing problems when the application is reactivated later on. Task-number: QTBUG-23448 Change-Id: Icc4902cbeac99eb631e569167227d9bcd4d4dcbb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Use available geometry when maximized.Rafael Roquetto2012-02-071-1/+9
| | | | | | | | | | | | | | | Use the available geometry as a maximized window would fit on the desktop in the available area (some space is used up by task bar, system menu, etc.) as opposed to the fullscreen geometry which would be the entire screen. cherry-picked from qt5/qtbase: c051d3350e4f227f71921e7db7e52d02525cc8fc Change-Id: Id20fdf68bcbd2eb1fc7db5cf1658bbefbe5737a4 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Reduces compiler warnings when compiling for WEC7jaanttil2012-02-031-0/+2
| | | | | | | | Task-number: QTBUG-22512 Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Take into account shaping in findRealWindowAlbert Astals Cid2012-02-033-3/+38
| | | | | | | | | | | | It can happen that there is a window covering all the screen but it is shaped to only take part of the screen. If that happens, besides the condition of QRect(attr.x,attr.y,attr.width,attr.height).contains(pos) we also need to query the server for its region rectangles and make sure the cursor is inside one of those rectangles. If that does not happen we have to return 0 so the hierarchical XQueryTree search continues Change-Id: Icb2204a50197e4a5e02e75601c67287525b290b0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Check for the clipboard manager when looping due to app quitingAlbert Astals Cid2012-02-022-3/+9
| | | | | | | | | | | | | | One can be extremely unlucky and on session logout get this: * All apps are going down * A Qt app checks if the clipboard manager is there to yield its clipboard contents * The clipboard manager is still there * Then just after that check, the clipboard manager finishes because of the session end * This means the Qt app will loop for 5 seconds trying to yield its clipboard contents to a clipboard manager that is not there anymore This is a backport of 689c4009fb9be348f9137a9092b068e056a3d8b3 in the qtbase (Qt 5.0) repo Change-Id: I8ab1f460aa5936c03f1afc1b6ff18824f1d6cbc1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Various Qt documentation fixes (wk 44)artoka2012-01-311-2/+2
| | | | | | | | | | | | | | | | 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>
* 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>
* 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 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-132-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11232-232/+232
| | | | | | | | | 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>
* 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-052-12/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
| * Correct client rect calculation for MCLmread2011-12-021-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clientRect calculation was adjusting the rectangle for the status pane. But this is now taken into account in the rectangle from Avkon, so we do not need to adjust when the status pane is there. However Avkon is supplying an inconsistent clientRect depending on whether we have all Avkon panes disabled (status pane and CBAs). When enabled, Avkon takes the splitview keyboard off the clientRect space, when disabled, Avkon ignores the splitview keyboard. Since we want to ignore the splitview keyboard effect on the clientRect, we only adjust when the Avkon panes are enabled. This has been tested with splitview keyboard, orientation change and debug output of the client rectangle returned in the following situations: - Normal app with status pane and CBA - App with CBA but invisible status pane - App with status pane and CBA disabled Task-number: ou1cimx1#938780 Reviewed-by: Miikka Heikkinen
| * Symbian: Fix CBA display on application with multiple windowsMiikka Heikkinen2011-12-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an application has more than one window and each window has widgets that can receive focus, sometimes a situation happened when the last focused window isn't actually the window that contains the current focused widget, which led to displaying incorrect CBA. Changed CBA displaying evaluation to be done whenever any control is focused instead of just windows. This can add a couple of extra S60->setRecursiveDecorationsVisibility() calls to some applications, but since that is typically already called multiple times anyway, it shouldn't be an issue. Task-number: ou1cimx1#935663 Reviewed-by: Sami Merila
| * CBA comes on top of option menuAri Lehtola2011-11-301-2/+7
| | | | | | | | | | | | | | | | Layout has changed so that option menu starts from bottom of screen. CBA is set behind in this case Reviewed-by: Miikka Heikkinen Task-number: ou1cimx1#932398
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-291-1/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * Merge branch '4.8-upstream' into master-waterWater-Team2011-11-161-28/+0
| |\
| * \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-121-0/+5
| |\ \
generated by cgit v0.12 at 2025-01-29 11:54:04 (GMT)