summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
...
* QWizard/Win: Handle hit testing correctly for Vista styleJonathan Liu2012-06-151-37/+48
| | | | | | | | | | | | | | | Clicking the area just below the close button when Aero is enabled reveals duplicate caption buttons. DwmDefWindowProc returns hit results for DWM caption buttons but DefWindowProc may also return hit results for non-DWM caption buttons. To resolve this issue, if DefWindowProc returns a window button hit result then we just use HTCLIENT (the client area) as the hit result instead. Change-Id: Ia741ce4f9aa944109d8de54c2f84009f5ea1883f (cherry picked from commit 9ab445d264fbcf57c48374526905a2f870de06a3) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Symbian: disable OpenVG as default on Symbian emulator buildsPasi Pentikainen2012-06-131-1/+1
| | | | | | | | | | | Symbian emulator shows QML applications badly when OpenVG graphics system is used. This fix ignores OpenVG graphics system default configuration when built for emulator target. Task-number: ou1cimx1#1005008 Change-Id: I63fb89c5074e03fd582bfbbccca55f33473285c3 Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QWizard/Win: Drag window on Vista with only left mouse buttonJonathan Liu2012-06-091-1/+1
| | | | | | | | | The QWizard window should only be draggable using the left mouse button on Vista. Change-Id: Ie6ec118cbb48440c5dc6b84c4361119b1bbbd0cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit dfe598716158ef7d5a800f69a65fc982a246a318)
* Windows: Fix uic3 autotest.Friedemann Kleint2012-06-021-2/+4
| | | | | | | | | | | | | After 39f2c09d9154e00409c73c6f6db90a4ddb06b8f0, Windows applications of type Gui/Tty (uic3) would emit many "QPixmap: Cannot create a QPixmap when no GUI is being used" when initializing the cursor cache, breaking the stderr checking of the test. Task-number: QTQAINFRA-428 Change-Id: Iac74fd7af905e462ac2063c58dfcd91a6b0759a7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix dangling pointer issue in QGraphicsItem focus handlingPauli Jarvinen2012-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When focused QGraphicsWidget is being hidden, it tries to move the focus to next focusable widget by calling focusNextPrevChild(true). If there is no such widget available, the focus is cleared altogether. The logic used to rely on the return value of focusNextPrevChild to decide if clearing the focus is necessary. This was incorrect because the return value may be true also when the focus has actually moved within the graphics widget in question rather than moving to the next widget. This is the case at least when GraphicsWebView item is focused. Thus, the focus could then be left on invisible item which was a serious issue: elsewhere in the qgraphicsitem.ccp, it is assumed that no visible item can point to invisible item with its subFocus pointer. Such pointers will become dangling pointers once the pointed graphicsitem is deleted, and the process will then crash as soon as the focus is tried to be moved to another item. Now, the logic has been modified so that it is explicitely checked after call to focusNextPrevChild if the item being hidden still has the focus. If this is the case, the focus is cleared. To be consistent, the same logic is applied also when disabling a QGraphicsWidget. Having focus on disabled item is not as severe issue as having it on invisible item, but it is still wrong. Task-number: ou1cimx1#995710 Change-Id: Ica32bc381befc3ccaac79fb4cf4d50c5d452fad0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Eliminate QTreeWidget drag crashJiewen Wang2012-05-311-1/+1
| | | | | | | | | | | | | In QTreeViewPrivate::adjustViewOptionsForIndex() wrong index had been used when referencing to array of viewItems. Variable row is set to the index of the QModelIndex, however it is not as same as the index in viewItems[] when there was hidden item in treeWidget. Index of viewItems[] should be used here. Unit test is added as well. Change-Id: Ie129cb63445bf1239ef7c5b2bc61b04dd9e81982 Task-Id: QTBUG-25333 Backport of <3be6ca3ee8c2c72f85b26a57538fd329ed811261> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QStatusBar::showMessage will always take new timeoutJiewen Wang2012-05-311-2/+0
| | | | | | | | | | | | There is a message check in QStatusBar::showMessage causing the call exits early if the new 'message' is the same as the current message. The check has been removed, and new timeout will always take effect. Unit test is added as well. Change-Id: Id3d6ed15104d4d40c1cd2c76444c30badc8b1b72 Task-Id: QTBUG-25492 Backport of <7381328bcc37283be97eedddc24c46be1e38490e> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Updated HID drivers for INTEGRITYKalle Viironen2012-05-302-178/+298
| | | | | | | | | This patch icnludes new INTEGRITY keyboard and mouse drivers. Task-number:QTBUG-24175 Change-Id: Ifbb01357a601c44bab5961cdfe82d1c7bd44b889 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix bug when destruction fields in QWizardCarl Schumann2012-05-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked a70b8d407e1ca46e5dc208580534feee7ddfe51a from Qt5's qtbase master branch. Maintain the consistency of QWizardPrivate's two members: QVector<QWizardField> fields; QMap<QString, int> fieldIndexMap; during and after calls to QWizardPrivate's void _q_handleFieldObjectDestroyed(QObject *) member function. The failure to maintain this consistency caused an out of bounds access and core dump in QWizard's field(const QString &name) member function. QWizard's field(const QString &name) member function expects the values in the QMap fieldIndexMap to be indexes into the QVector fields. Prior to this change _q_handleFieldObjectDestroyed only removed the appropriate entry from the map and erased it from the vector. It did not decrement by one all the indexes greater than the index that was removed from the map and erased from the vector in the rest of the map. For example ... So if initially have the following mapping ... "field0" -> 0, "field1" -> 1, and "field2" -> 2 with fields of size 3. After destruction of "field1" have ... "field0" -> 0, and "field2" -> 2 with fields of size 2. Now attempts to look up "field2" using QWizard::field will have an out of bounds error and possibly core dump or trigger an internal Qt assert because an attempt to access this->fields[2] will be made. It should be accessing this->fields[1], but does not because the map is no longer consistent with the vector. This change adds a decrement by one for all the indexes greater than the index that was removed from the map and erased from the vector. Task-number: QTBUG-25691 Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Symbian: inputcontext reports pointer events to FEP during inline editLauri Malmi2012-05-213-5/+35
| | | | | | | | | | | | | | | QCoeFepInputContext::mouseHandler() must report pointer events to FEP by calling CAknExtendedInputCapabilities::ReportEventL( CAknExtendedInputCapabilities::MAknEventObserver:: EPointerEventReceived). Based on this event FEP commits inline edit properly and sends notification peninputserver/VKB. Earlier QCoeFepInputContext:: mouseHandler() called CCoeFep::CancelTransaction() direclty which lead to inconsistent inline edit state between FEP and VKB. Task-number: ou1cimx1#991638 Change-Id: I90641ffd5aed97b27f2ca2328c0296e14b12f319 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix missing include in QWS shared memorySamuli Piippo2012-05-151-0/+1
| | | | | | | | | QWS shared memory was missing include file for QByteArray. This fails with QNX when precompiled headers are not used. Change-Id: Ifb682863736ade3f74ea53a30d6fb1d4a5ff16dd Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* XShaping drag and drop fixesAlbert Astals Cid2012-05-141-8/+12
| | | | | | | | | | | | No shaping rectangles means no interaction with the window The shaping rectangles are based on the window coords, so need to substract the window coords when checking for the point And some tests to prove this change is needed Backport from commit 07f3c1e26aa6dcd07a9705e7b2ea02ace9ea7c5d from qtbase Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Always process window (de)activated eventsKevin Ottens2012-05-101-3/+0
| | | | | | | | | | | | | | | | | QApplication::setActiveWindow() is fully able to deal with null pointers for the activated window. It is in fact necessary to call it even in case of a null pointer as it is the only way to get a ApplicationDeactivated event properly queued. Without this patch no ApplicationDeactivated event get delivered when the platform plugin informs the Qt event system of the corresponding user interaction. Note: This doesn't apply to qtbase which has the proper behavior, this bug is Qt4 specific. Change-Id: I1128d0233a8f85943cfe5fc3c298a43f66b6d4aa Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix define to build without gtk style.Frederik Gladhorn2012-05-081-1/+1
| | | | | Change-Id: I750664ca0c227df4b8792536b2a0beec9c96f845 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Fix application font loading in basic font dbJiang Jiang2012-05-041-5/+15
| | | | | | | | | | | | | | | | | | | We need to reregister fonts in initializeDb because basic font db doesn't have an internal record like fontconfig does, so just repopulating the font database won't work. db->reregisterAppFonts is now used properly as intended (reregister application fonts after the system font database has been cleared). Also, static variable 'initialized' in initializeDb() is removed since we check privateDb()->count to see if it needs to be populated again. Task-number: QTBUG-22063 Change-Id: Ifc66392b56b72acbe08b99256c61421c204be5d7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit 89cfe9eb01ad75c14121dbd6038b7c791226acf1) Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix for clipped Vietnamese characters when typed with VKBMarko Kenttala2012-05-042-0/+109
| | | | | | | | | | | | | Adding tone marks with VKB to Vietnamese vowels caused them to be clipped from top. Added character conversion to Symbian VKB handling so that correct characters without clipping are used. Task-Number: ou1cimx1#981433 Change-Id: Iaf9f2ce9f5cf42e74cac100658025eb6e20e6487 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix Symbian key event code mapping in QSymbianControlRiikka Inkila2012-05-041-1/+1
| | | | | | | | | | | | | | | | Symbian key events that represent characters/symbols whose Unicode values are above the value range of S60 special keys are currently mapped incorrectly to S60 special key events within QSymbianControl class. This must be fixed as Symbian AknFEP can nowadays deliver character input from virtual keyboards to FEP-aware text editors only by simulating a corresponding key event and virtual keyboards can obviously contain characters and symbols whose Unicode values are above the S60 special key value range. Task-number: ou1cimx1#979068 Change-Id: I57c4e87f6a532641ece7d45f29d3956ebb25b736 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix compilation error on old Unix systems caused by ShapeInputSergio Ahumada2012-05-031-1/+3
| | | | | | | | | | Change 33bb996c83e541c26df632b3e8883a1190cc97f0 caused a build error on Solaris/HP-UX (at least) as ShapeInput type is not present in default system headers. Change-Id: I6e19351651856ed71bc9ceaeae625ceac74b27b0 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* 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>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-261-32/+9
| | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: I27f9496c2c998de7ea858b943c2f19d979ef18c2 Reviewed-by: David Faure <faure@kde.org>
* Add out-of-memory checks to QImagePauli Jarvinen2012-04-251-0/+11
| | | | | | | | | | | | | | | | Some of the methods of QImage crashed on out-of-memory situation as they referred to null pointer if creation of a new QImage instance had failed. Many cases like this were already fixed by commit a041e4eca3467c1baa6245b6fb47def127f30f41 which was a fix for QTBUG-1985, but few cases still remained. Now, all the lines creating a new QImage instance in qimage.cpp have been gone through and sanity checks have been added where it was necessary to avoid immediate crashing. Task-number: ou1cimx1#994957 Change-Id: I1f07e8890bc91de18af075be73b1a06c667f3776 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@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>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-132-6/+7
| | | | | | | | | | This is a regression introduced by commit d63910575949106f84dacf04abaa14fc866aa66b. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476 Reviewed-by: David Faure <faure@kde.org>
* Only send progress bar updates when visible.Frederik Gladhorn2012-04-131-1/+2
| | | | | | | | | | | | Screen readers tend to announce progress. Some applications (for example KMail) have hidden progress bars that update frequently. While the applications should be fixed, it's better not to spam the user with continous progress announcements. Change-Id: I5f3b5a83dc80594d995b10e58527115de8601c77 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Symbian: avoid crash when inline editing is canceledRiikka Inkila2012-04-131-3/+4
| | | | | | | | | | | | | | | | | | | | Native side editor state sync request was added into QCoeFepInputContext::CancelFepInlineEdit method to fix QTBUG-20919: text prediction word list/bubble didn't disappear from TextArea/ TextField after a tap and the issue was fixed with the sync request. However Symbian AknFEP was changed in Belle FP1 release so that this sync request is no longer needed to get rid of the exact word bubble when inline editing is canceled with a tap and it can actually currently lead to a crash in the native side with certain input methods as AknFEP doesn't expect FEP-aware text editors to request editor state sync within MCoeFepAwareTextEditor::CancelFepInlineEdit call. Thus the sync request should be made only with older Symbian releases. Task-number: ou1cimx1#983695 Change-Id: Iab7753bbe8b279f89abc1853824a83ad210c5440 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Fix handling for key repeat events in the QPA linux input pluginReuben Dowle2012-04-131-1/+1
| | | | | | Change-Id: Ibbdb74b5fb568153780355c1ebbd9e678b884c22 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fixes crashes and memory leak in QMacPixmapDataAndreas Loew2012-04-131-13/+44
| | | | | | | | | QTBUG-24709 QTBUG-24710 QTBUG-24711 Change-Id: I7b4034fae8b3b0ee43eb04ecce3c31479adb3b68 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed crash in QImage in out of memory conditionAndreas Loew2012-04-131-0/+4
| | | | | | Change-Id: I64467525d3365903e83b2e7e9cf381dd5a39c2b4 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Upgrading libpng: Patches to libpng 1.5.10 for Qt usageaavit2012-04-121-1/+0
| | | | | | | | | | | | This is the collection of those earlier patches to libpng in Qt that are still relevant, updated as required: d6ba0e805fd2b17e2e0cbbce32e218551505d91f 91bf025444f13eb269ece6bb430a841638bb32a8 125dae45c5c8e09a58409095f6661ab65ea1e71f d6947bcbed97889d7d56d400f81eb1691a3f18e1 Change-Id: I06603041b5971ade4742f600dbea4cca98ff95a5 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fix initial size of QMainWindow with unified title and toolbar on MacAndy Shaw2012-04-121-1/+1
| | | | | | | | | | On Mac if the toolbar was hidden in a unified title and toolbar main window then it would have too much space between the title and the central widget. Task-number: QTBUG-24423 Change-Id: I5e434da2447f33795f3771e43b42930824482d8e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Ensure that the IME composition is handled correctly on MacAndy Shaw2012-04-123-5/+13
| | | | | | | | | | 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>
* Fix memory leak when drawing text in non-common scriptEskil Abrahamsen Blomfeldt2012-04-121-3/+10
| | | | | | | | | When the fontEngine() cached was updated for new parameters, we would overwrite the cached engine, but not deref the old cached engine, thus it would never be deleted. Change-Id: I3b88698712e468ffa634bd98019a7871662cc363 Reviewed-by: Jiang Jiang <jiang.jiang@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>
* Accessibility: send cursor move updates.Frederik Gladhorn2012-04-121-0/+5
| | | | | | | ATs need to be able to react to cursor movement. Change-Id: I8fbb036b6a180f555505ab529020d0aea2d25e7c Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Do not send QEvent::AccessibilityPrepare.Frederik Gladhorn2012-04-121-3/+0
| | | | | | | | | This leads to crashes in the unix bridge when notifying about object destruction. Task-number: QTBUG-25240 Change-Id: I24069a1c9e63d4c0a1f9b1336b94ab0712ac5ccf Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fixes a regression; missing cursor blink when input mask is set.Andreas Aardal Hanssen2012-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't say for sure why q*linecontrol passes an empty rect to the updateNeeded() signal when an input mask is set; presumably the empty rect at some point has meant "full update", but there are a few problems with this. Surely a full update is wrong, even if the semantics have been lost in translation somewhere (likely the qlinecontrol refactoring). This fix ensures that empty rects from updateNeeded() are interpreted as a request to update the whole widget. A further improvement would be to ensure the line control doesn't request a full update when an input mask is set. The cursor is usually wider when a mask is set but because of QLineEdit::paintEvent()'s implementation, there is currently a mismatch between the cursor width as seen by q*linecontrol and what is actually drawn, which causes rendering artifacts if updateNeeded() sends the cursorRect(). Since QLineEdit and Q*LineControl aren't actively developed, it's best to keep this fix minimal, although the performance cost of updating the whole line edit when an input mask is set is unfortunate. cherry-picked from qt5/qtbase a9cda515177db1615f8d47becf2aa781f26955ae Task-number: QTBUG-7174 Change-Id: Ie51e015d760915e07b0220b770f04fc958d93a12 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QWS: Add support for HomeLocation and TempLocationBhooshan Supe2012-04-111-0/+5
| | | | | | | | | | | There was no implementation for "QDesktopServices::HomeLocation" and "QDesktopServices::TempLocation" so adding the same. Change-Id: I6bc58cb83eb64367d8b9eedeea8c43bc4dcad4b6 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Disconnect slots from the old sourcemodel in QIdentityProxyModelk.blammo@gmail.com2012-04-101-40/+40
| | | | | | | | | | | | | | | When setting a new sourcemodel QIdentityProxyModel::setSourceModel tries to disconnect from signals belonging to the NEW model instead of from the existing sourceModel(). QIdentityProxyModel thus receives signals from both the old model(s) and the new model. This results in ASSERTS triggering in various slots, for example: "Q_ASSERT(topLeft.isValid() ? topLeft.model() == model : true);" in QIdentityProxyModelPrivate::_q_sourceDataChanged. Change-Id: Ic6f65a9ee10981d00206335f2edef78272fadc1a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from commit fae4a2555a9402e8cecf67242b29dca624cc61e8) Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@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)
* Made qt_accStripAmp handle "&&"José Millán Soto2012-04-091-12/+28
| | | | | | | | | | | | | Changed qt_accStripAmp implementation to handle texts which contains pairs of ampersands representing a single ampersand. In order to do that, a new static function called qt_accAmpIndex was created. This function is based on the code of qt_accHotKey, which was changed to use qt_accAmpIndex. Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix signed/unsigned warnings (QWS)Sergey Gusarov2012-04-052-3/+3
| | | | | Change-Id: I98ba87fa236b1a10ea2499e270e71a94f54c1c3b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix clang warningSergey Gusarov2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | In file included from /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/QDirectPainter:1: /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: warning: class 'QWSEmbedEvent' was previously declared as a struct [-Wmismatched-tags] class QWSEmbedEvent; ^ /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qwsevent_qws.h:269:8: note: previous use is here struct QWSEmbedEvent : QWSEvent ^ /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: note: did you mean struct here? class QWSEmbedEvent; ^~~~~ struct 1 warning generated. Change-Id: Iebda5efe8547b16e457486166a8abc8479b2fd8d Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix a crash in cursorToX() when new block is addedJiang Jiang2012-04-031-0/+4
| | | | | | | | | | When an empty new block is being added, the layoutData->memory data will be 0, thus QTextEngine::attributes() will return 0. We should only access the attributes pointer when some text actually exist. Task-number: QTBUG-24718 Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* 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 build error for Blackberry OS QDesktopServicesRafael Roquetto2012-03-301-0/+1
| | | | | | | Add a missing include to qdir.h Change-Id: Ie24eac38411b1a578e725a62121a55df0e673595 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>
* The scaling should not effect the width of a cosmetic penAndy Shaw2012-03-301-1/+1
| | | | | | | | | | | | When the scaling effects the pen width so that it is less than 1 pixel in width then it would use the QCosmeticStroker to draw, however this should not be the case for cosmetic pens that are not less than 1 pixel in width as the scaling does not change their width. Task-number: QTBUG-25006 Change-Id: I142db0f3a7ee02aa87171495d5a7a7011100814e Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit 6eae3cec5a34fbed28e519ffd8a8f3f1cd7b5c5b)
* Support QDesktopServices on BlackBerry platformsRafael Roquetto2012-03-292-1/+116
| | | | | | Change-Id: I10506b83efda8efb12ccc531f60cd4cd9b4b5bc9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
generated by cgit v0.12 at 2025-04-22 03:34:05 (GMT)