summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix comments to use pre C99 standard style insteadPasi Petäjäjärvi2013-01-281-5/+5
| | | | | | | | VxWorks compiler fails to compile *.c file with C99 style comments on it Change-Id: Ib5c5ff14006c17f9392b77363232b8b7cc112d34 (cherry picked from qtbase/2aaffe1800db0d8a170b278ac9a43f2e00ef0e8f) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use QDir::homePath() for tilde expansionPasi Petäjäjärvi2013-01-281-1/+3
| | | | | | | | | | VxWorks does not have concept of users and therefore has no function getpwnam. Use QDir::homePath() which returns actually QDir::rootPath() if there is no HOME env variable set. Change-Id: I0786ace2c05a14380dd725384972a19ccc07d916 (cherry picked from qtbase/2d8a4c2d3f86e3ae40b4a388de57021b98b9778d) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Only send the enter/leave event when it makes sense to do soAndy Shaw2013-01-271-8/+12
| | | | | | | | | When show/hide is called on a widget on Mac then it needs to send an enter/leave event. But it should only do that if the widget under the mouse is actually the one that is being shown/hidden. Change-Id: I53c782f5deee740cbc34e1fcc7b551a108230081 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* qkeymapper_win.cpp: Define missing constant for MinGW.Friedemann Kleint2013-01-251-0/+3
| | | | | | | | | | | Fix MinGW compile breakage introduced by 68331c5436506b6f9b4c2a49692a09020e4eef27 . Task-number: QTBUG-8764 Task-number: QTBUG-10032 Change-Id: I26bcefc382010eee7d79b806b3d9f08b6cb2ff8d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fix TextInput test failures.Andrew den Exter2013-01-231-0/+2
| | | | | | | | | | | | | | | | emitCursorPositionChanged won't emit cursorPositionChanged if the cursor position hasn't changed but that doesn't mean the micro focus hasn't changed, so emit updateMicroFocus changed when cursorPositionChanged isn't. Task-number: QTBUG-21017 Task-number: QTBUG-21011 Task-number: QTBUG-20719 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> (cherry picked from commit 6e0e834e0398192a6da11d1e1bca6b74769fb75d) Change-Id: Ia0d244eea051f2a870a084742c4c22f5a45a87bc Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Don't update the input method if the im hints haven't changed.Andrew den Exter2013-01-221-0/+2
| | | | | | | | | | | | | | | | | Depending on the implementation updating an input method can be expensive and various widgets will at times call setInputMethodHints with unchanged hints. QGraphicsView being a notable offender due to the complexity of the circumstances in which the hints can change. Skipping the update here ensures the input method isn't updated unnecessarily for all widgets. Task-number: QTBUG-19854 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit 40e6b1d0b8c1804dfb33032fa70b6604b91f6f90) Change-Id: I36ae35585ee20a4e01ca0d62c71e896dbdb51a3f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix glitch on MNG animation Loops when QMovie caching is enabledDavy Durham2013-01-221-0/+8
| | | | | | | | | | | | libmng delivers the last animation frame with a 1ms delay, and delivers an extra blank frame after that with the proper delay time, but this confuses QMovie when QMovie::cacheMode() == QMovie::CacheAll. This was commited as 313d60c107d9659efd5e93ba5a036054f6b1ebba in qt5 Task-Number: QTBUG-28894 Change-Id: I1dd585cd6f0ced8c777bd1f15ac2c9f36ca63f41 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Removed unused include headers <time.h> and <sys/time.h>Pasi Petäjäjärvi2013-01-221-5/+0
| | | | | | | | Nothing is used from the above header files so these dead includes can be removed. Change-Id: I381ea62e5a0bc623bb984c764be55c7a2f2ee317 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* To support QT_NO_IM on Linux/Windows/MacJing Bai2013-01-2118-28/+69
| | | | | | | | | | Fix compilation issue when QT_NO_IM is defined. Also fixed references in tests. But fixing plugins/examples seem not necessary at this point. Task-number: QTBUG-26109 Change-Id: I2067051951616012117efa6716640cbf198fdb2a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* fix illegal reference to a destroyed variableGatis Paeglis2013-01-201-1/+1
| | | | | | | | | | | | | The char array 'dash_o' is an automatic variable. The string "-o" is copied into this array. Later the address of the array dash_o is assigned twice to lpargs[++i]. After leaving the block, the array dash_o is gone and lpargs[...] contains an illegal reference. This was discovered in a release mode when compiled with gcc version 4.7.2 Patch doesn't apply for Qt5 where 'lpr' support has been removed. Change-Id: I4f99badfa380ad3b29893a350f0d699bfb934c68 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QTBUG-15319: fix shortcuts with secondary Xkb layout.Aurelien Lourot2013-01-181-1/+4
| | | | | | | Change-Id: Iadb89137ec017b9dcd4d1588fd582ea46a9d7cc1 Reviewed-by: Aurelien <aurelien.lourot@gmail.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change all shmget calls to user-only memoryThiago Macieira2013-01-182-2/+2
| | | | | | | | | Drop the read and write permissions for group and other users in the system. Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 (cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) Reviewed-by: Richard J. Moore <rich@kde.org>
* Fixed dead keys on MS WindowsJuan Luis Boya García2013-01-161-3/+9
| | | | | | | | | | | | | | | | | | | | Since Qt4, there is a bug which causes Qt to drop dead key modifiers (like graves and acutes) if the user types enough fast on MS Windows. This happens because of an extrange behavior of Windows, which drops dead keys on ToUnicode() calls. This patch tries to workaround that. Task-number: QTBUG-8764 Task-number: QTBUG-10032 Conflicts: src/plugins/platforms/windows/qwindowskeymapper.cpp Change-Id: Ifdde25817743194fd5c0b7533c27f46a7a108ca4 (cherry picked from commit 5d2bb24cc90194a3458f8741e30ae7afe0b45f5c) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Use a UUID for the NSToolbar in unified title and toolbar.Jake Petroules2013-01-151-1/+2
| | | | | | | | | | | | | | | | | When two NSToolbars in an application share the same identifier, Cocoa tries to synchronize their state (item position, view mode, etc.), and this behvavior interferes with and crashes Qt applications in certain cases when toggling the unified toolbar on and off. Therefore it is necessary to use a unique identifier for each native toolbar created. Does not affect Qt 5. This functionality has been removed and an equivalent will be provided by QtMacExtras which uses a completely different approach, though I7d5c8d58e45a504480a1ce67065add15cb35ad8f could be considered Qt 5's rough equivalent to this. Task-number: QTBUG-19207 Change-Id: I9030d56941d12a2c1f7a328337bf986f1b51eeb8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix QVistaHelper::disconnectBackButton().Friedemann Kleint2013-01-152-1/+7
| | | | | | | | | | Restrict disconnect() to the clicked() signal, leaving connections to destroyed() (as used by QStyleSheetStyle) intact. Task-number: QTBUG-20292 Change-Id: I7471b4d1262ec0684e4446b5c17513717c502749 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/273713b81f5e580748c281c17e08e8b3e2e8ee70)
* Prevent a crash when hiding a window on Mac OS X 10.7 or laterAndy Shaw2013-01-141-0/+4
| | | | | | | | | | If a tool window is ordered out when there is a full screen widget around then it would cause a crash because of a new animation from Lion. This seems to be provoked by the fact that we are faking the fullscreen functionality in Qt. Change-Id: I07cdfddc6c2bb766df7809912fb97c4f1ba8873b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QMenu: Fix nested popup when keyboard shortcut is usedOrgad Shaneh2013-01-141-1/+1
| | | | | | | | | | Task-number: QTBUG-20403 Change-Id: I2a5fe00dd16e9dc1ec0d742a8f48083fc2954996 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qtbase/b6963f109ad54c6f03b3391d57db9a536d49ba7d)
* Check for gtk_adjustment_configure as this is not always implementedAndy Shaw2013-01-141-1/+3
| | | | | | | | | | | | | | Some implementations seem to not have the gtk_adjustment_configure function implemented so we check for this so that there is no problem when it tries to use it. Task-number: QTBUG-23569 QTBUG-25760 Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com> (cherry picked from qtbase/7fcf1cf674d09d9dd1d41e2913252017f1d599ca)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131249-1250/+1250
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix title bar height of Aero wizard on Windows 8.Friedemann Kleint2013-01-102-9/+23
| | | | | | | | | | | | Windows 8 no longer allows for negative values to WM_NCCALCSIZE to shrink the title bar. Task-number: QTBUG-28435 Change-Id: Ib6aa95a98663c4dc8e9a18407b5d49a0daeab8f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5fb6331a17a5c43b91daddf4a30e46ccbd1419b5)
* Do not use getuid() and getgid() functions in VxWorksPasi Petäjäjärvi2013-01-101-1/+1
| | | | | | | | VxWorks has no concepts of users and groups, therefore no such functions exists on VxWorks. Change-Id: I56e1c80ffd4e8d88ae41e3a0bb97df05c6a2f98f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Mac: Fixed text rendering in selected tab buttonGabriel de Dietrich2013-01-071-22/+11
| | | | | | | | | | | We resort to custom Qt rendering when selected since it looks better than using Carbon's HITheme engine. This is a backport of Qt 5's 65b39b3cdcdfe175d80ccf9428168ed51be77fd8, and also reverts commit f7bba6cc700f5f6b1ff6a40b8c475924de206022. Change-Id: I684db730f05bead16e16a0d1c8f20164e9fc70b7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix QWidget::showFullScreen() on QPARafael Roquetto2013-01-051-1/+1
| | | | | | | | | | | | | When showing full screen, we need to enforce that the size of the widget *is* the size of the screen. When calling QWidget::resize(), there was a chance for the layout to bypass the screen size, causing the toplevel widget to be clipped. This fix is not necessary on Qt5. Qt5 implements this differently and correctly. Change-Id: I1f4467dd14310ee20376caba8780507f8d787720 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix QWidget::hide() on QPA platformsRafael Roquetto2013-01-051-1/+0
| | | | | | | | | | | | | We must check within QWidgetPrivate::hide_sys() if the widget has a platform window and hide it. Fixed on Qt5 as a side effect of 09163941268745bbe231d0b2c25697940aa40127 Change-Id: Id0f5e748e69789027cbde427d37655d19a4ccab2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Debao Zhang <hello@debao.me> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Add cursor position support to QPlatformCursorRafael Roquetto2012-12-193-1/+36
| | | | | | | | | | Based on qt5 4469de4ce7a72ab6824629bfe8483131aaf22137 Change-Id: I5886c11f3dcf72943e2956beaa92464657110ce9 Reviewed-by: Laszlo Agocs <lagocs83@gmail.com> Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QMenu: Do not set snapToMouse if a caused-widget exists.Friedemann Kleint2012-12-191-1/+1
| | | | | | | | | | | | | When clicking at the bottom-right corner of a menu in a menu bar, it appears at the wrong position. Add test and stabilize RTL-tests by making sure the layout direction is cleared should they fail. Task-number: QTBUG-28031 Task-number: QTBUG-2596 Change-Id: Ibc5ae916388753908e9f3ee98e8859faaa0c8723 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from qtbase/bf178c77dda1db56ae698c1d31a6e3f685f4830f)
* Backport adjusting cursorToX for trailing spaces from Qt 5Eskil Abrahamsen Blomfeldt2012-12-192-15/+10
| | | | | | | | | | | This is a backport of d07982b104de5dc2b54bef09c071500ce22cf539 from Qt 5 which fixes cursorToX() in some cases, e.g. when a line filled with spaces is ended by a soft line break. Task-number: QTBUG-27354 Change-Id: Ia88873aeb3c0620044fefe24fc6bb1310e3aa339 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* a11y: Do not refer to destructed QObject in Windows bridgeJan Arve Saether2012-12-161-10/+24
| | | | | | | | | | | | The crash could happen if a QWidget in the UI got deleted, and the AT client later tried to access the widget through the cache (qAccessibleRecentSentEvents()). Solution: Use a QPointer as a guard. Task-number: QTBUG-26187 Change-Id: I41eab158989fddfa147309b6bd91ac0cd1fe7b1a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QPaintEngine: Fix build if compiled with QT_NO_XRENDERPeter Hartmann2012-12-151-1/+4
| | | | | | | | | composition_mode is only defined if QT_NO_XRENDER is not defined. Bug was introduced with 439aa67582e715ddc0ca7e30305b0c9498a71f81 "Fixes ignored composition mode in QPainter::fillRect with X11 engine." Change-Id: I2dc036ffa277cbf0f9327ede3fead9a407147fc0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Modified vertical alignments of simple widgets on OSXTero Ahola2012-12-141-7/+7
| | | | | | | | | | | | | | | | Adding QCheckBox, QComboBox, QLineEdit etc. into an HBox layout or grid layout makes the layout look like a snake's trail. Fixed the positioning of these widgets to make the layouts visually more appealing. Updated qmacstyle auto-test accordingly. Task-number: QTBUG-13635 Ammended-by: Gabriel de Dietrich Ammended-by: Liang Qi Change-Id: Ic12346f764d8092292b8388f50d184b37d7cef5f (cherry picked from qtbase/8b6de4677142cab41790ca50ce6c7f1efbab5de8) Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac: fix bugs for font selection in QFontDialogLiang Qi2012-12-142-11/+7
| | | | | | | | | | Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ia10aaff50e1ffdb248c730fb46a8a66088ee64bb (cherry picked from qtbase/3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa) Reviewed-by: Liang Qi <liang.qi@digia.com>
* Fixes ignored composition mode in QPainter::fillRect with X11 engine.Samuel Rødal2012-12-111-2/+8
| | | | | | | | | It's not sufficient to check that the source brush has an alpha, there are composition modes that depend on the destination instead. Task-number: QTBUG-28499 Change-Id: I4b267544c607b6a68c4c52a6784d526bec604d75 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix SSSE3 support build failure on mingwErik van Pienbroek2012-12-111-1/+1
| | | | | | | | | | | | | | | | Commit 94253f3472a13ac4eab3ccfbbba9d14165647f85 made QMAKE_MAC_XARCH to be set to 'no' for MinGW environments. Due to this change building for MinGW environments where SSSE3 support is available got broken. While building the imageformats plugin qjpeg4 the following error occurs: undefined reference to `_imp___Z32qt_convert_rgb888_to_rgb32_ssse3PjPKhi' This commit makes building Qt on MinGW environments where SSSE3 support is available working again Change-Id: Ib2a4b3cc244af8bdde70d2d2240c70ff0e7a4cc2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
* Fix QWidget support on PlaybookRafael Roquetto2012-12-091-1/+29
| | | | | | | | | | | | The BPS version provided by the current version of the Playbook OS does not support orientation locking. This patch implements this manually. This patch is not needed in Qt5, since the API has changed. Change-Id: Ibba6fb3437cb392e3ba3d2b1997a178653226131 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* [QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layoutMarc Mutz2012-12-093-5/+23
| | | | | | | | | | | | | | QStackedLayout doesn't have support for QLayout, only QWidget, so the issue doesn't arise there. (cherry-picked from qtbase/716d33d2a73ade42eb31be3e8ecbaeecdd5ddd21) (only change: s/reset()/clear()/ in the tests) Reported-by: Johannes Schaub Task-number: QTBUG-27420 Change-Id: I7f3c4b1996e954428c00d4dda1095712efa91367 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Disable graphic effects for widgets on Mac to prevent crashingAndy Shaw2012-12-091-1/+4
| | | | | | | | | Since graphics effects on widgets are not supported on Mac then the code is #ifdef'd out so that it does not crash instead. Task-number: QTBUG-24792 Change-Id: I4d81675b54816fa60cf66696b1a0a7b0206474e3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix for fullscreen resolution change on QWSKarim Pinter2012-12-071-2/+6
| | | | | | | | | Fix for QTBUG-27607. Now it handles the setMaxWindowRect for fullscreen widgets. It is called when the resolution changes with QWS. Change-Id: I0fdbb39c55f727b6507fbb14369943dd8b7c2d7e Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Clear focus of GraphicsItem focus scopes and their children.Andrew den Exter2012-12-051-3/+9
| | | | | | | | | | | | | A focus scope has effective focus if one of its children is the focus item, clearFocus() should remove effective focus from an item and its children not just from the focus item. Task-number: QTBUG-28328 Reviewed-by: Martin Jones <martin.jones@jollamobile.com> (cherry picked from commit ab97a44b6ae5cc826460f3704669383afd398594) Change-Id: Ib6f43b40091cb1bb1a0d5b8b9ac71e44f35b037b Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Remove invalid assert from QGraphicsSceneRafael Roquetto2012-11-281-1/+0
| | | | | | | | | | | | This assert has become invalid since commit 40fef403. After that commit, the 'origin' mentioned by the assert is not necessarily the first item of cachedItemsUnderMouse, since it origin can be reassigned at line 5839. cherry-picked from qt5 f4b80c1210e444ad7454abfb80ba166ce2e2a5f2 Change-Id: Iae264f5b301b4bf76b59c7262b06edb24c594ee5 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* Fix conflict between QMainWindow::restoreState, QWidget::setStylesheet.Mitch Curtis2012-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | If QMainWindow::restoreState() then QWidget::setStylesheet() were called before the QMainWindow is shown, the size of QDockWidget can not be restored. QWidget::setStylesheet() will generate QEvent::StyleChange event, which will cause the function QDockAreaLayout::fitLayout() to be called before the layout of MainWindow is activated. Although the state info has been stored in a QMainWindowLayoutState variable by QMainWindow::restoreState(), but QMainWindowLayout::setGeometry() still isn't called at present. So QDockAreaLayout::fitLayout() will force the size of dockwidgets and centralwidget to be calculated using the wrong geometry, which will break the state restored by QMainWindow::restoreState(). This is a side effect of 692e9103ebb85b90e79377206d5d03b704d43d42. This patch is a backport of d2f65aa470fe30849a01380e4a50e8a4ebbce07e. Task-number: QTBUG-15080 Change-Id: I5b912e80e99b1f8b7a6f2a9a3e541fac3455c3db Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Debao Zhang <hello@debao.me>
* Draw disabled QMenu items in inactive state in vista style.Friedemann Kleint2012-11-281-1/+1
| | | | | | | | Task-number: QTBUG-27992 Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5223e7eb27dc15f8428aeb66dd8c57098dedce58)
* Fix multiple tablet hires coordinate bug under X11Ryan Stelzleni2012-11-281-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | On X11 if you have multiple tablet input devices, like a Wacom Cintiq and a Wacom Intuos tablet connected at the same time, one of the tablets will generate incorrect high resolution coordinates. The reason seems to be that when translating the XEvent in qapplication_X11.cpp the code searches for the first tablet device it finds that supports the type of the current event. Since both tablets will support this event type, we wind up always finding only one of the tablets. Specifically, the first tablet that was found when enumerating tablets during qt_init. Then all calls to QTabletDeviceData::scaleCoord are made on the same device, so the size of one of the devices is never used. That device will wind up with incorrect high resolution coordinates. When not running under IRIX the XEvent will have a deviceid which we can use to find the correct device to use for scaling. This change implements that fix. Change-Id: I667a52a729273a9b12880592d0a4cd7ce7f16106 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix hover handling in QTreeViewMiikka Heikkinen2012-11-242-14/+12
| | | | | | | | | | | | | | | Cached hoverBranch could get invalid if branches were collapsed or expanded programmatically, leading to a crash in some situations. Fixed the logic for updating hovered over branch indicators and also now update hoverBranch when drawing so that it is guaranteed to be up to date there - this fixes issues like hover indicator not updating when the view is programmatically scrolled. Task-number: QTBUG-27158 Change-Id: I5bd1ad76aee512ad78df33959a84ead16886a47c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qt5/qtbase commit fd6a870136ab2fdb3ce8b516abcf8c05d45caba7))
* BlackBerry: Removed filtering of window system eventsBernd Weimer2012-11-231-4/+3
| | | | | | | | | | | | | Only one event type can be passed to the event filter in Qt4. For the BlackBerry platform this will be BPS events. This should be acceptable, as there isn't any documentation stating that it should be window system events for QPA ports. In Qt5 the implementation is different (it is possible to pass the event type along with the event itself). Change-Id: I95550cec8a04a4994479904bc68544742a458aa9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* When clicking on a menu item which has a sub menu it should not closeAndy Shaw2012-11-151-0/+3
| | | | | | | | | If you clicked on a menu with a submenu then it should do nothing as this is what the native behaviour is on Mac. Task-number: QTBUG-10706 Change-Id: I7c8898b4b35a8189e1a8270d8a528eb56c81aed7 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix scrolldown arrow not showing on popup for QMenuMiikka Heikkinen2012-11-141-2/+4
| | | | | | | | | | | | | | | | | Scrolldown arrow was not shown when a taller than screen QMenu was opened because the check to draw it used the size that was already adjusted to the screen. Fixed by using the actual menu size in the check. Also fixed the case where the menu was scrolled, closed, and reopened, in which case the size hint would return incorrect cached value. This led to scrolldown arrow not being shown in case the menu was previously fully scrolled down. Task-number: QTBUG-27445 Change-Id: Icd8d774071662a9317b3ac53cb05b31cadba96ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qt5/qtbase commit fe8eb057fa05433e96de21df34871647f421f962))
* Windows: Fixed handling of key events containing ctrl modifierOliver Wolff2012-11-141-0/+8
| | | | | | | | | | | | | | | QKeyEvent::key() returned the wrong value if the ctrl modifier was used in that key event. That was due to the fact that ToUnicode might not return the correct code for these events/keyboard states. While it works for alt+shift+= (us layout) and gives '+' as unicode value it just claims that it cannot translate the given state for ctrl+shift+=. So if the control modifier is used and ToUnicode return 0 toKeyOrUnicode should try again without the control modifier. Task-number: QTBUG-10781 Change-Id: I771f7ed18bcce60d1c7c3f6157d169d4e80ddd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Don't use Cocoa code unconditionallyAndy Shaw2012-11-141-0/+2
| | | | | | | | | | | The Cocoa code should only be used if QT_MAC_USE_COCOA is defined, this was causing problems in Carbon with menus which are now resolved. Task-number: QTBUG-27960 Change-Id: I60186d69a869def4b2f03f1b0fdde82208fcfbe5 Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* qpa: Fix rendering issue in blitter engine (negative scaling factors)Julien Brianceau2012-11-081-1/+5
| | | | | | | | | | | | | | A 180° rotation results in a TxScale QTransform with negative scaling factors (x=-1.0 y=-1.0). This is not properly handled by blitter paint engine yet, so use software rendering fallback in this case. This rendering issue can be seen when using "-webkit-transform" CSS property in WebKit with DirectFB QPA platform. cherry-picked from qt5/qtbase 07ea3cf0b3883979e84bd91a5dc6a7a126de3123 Change-Id: I0911fd1166a3968d0a1d6bcca47ce2b26866de44 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix GIF image decoding: do not zero transparent pixelsaavit2012-11-081-9/+6
| | | | | | | | | | | | For the special transparent color index, the decoder would skip writing anything out (thus leaving the pixels at 0 rgba value). Although correct for later frames, for the initial frame this would loose the color information for such pixels (which one otherwise could have made visible e.g. by converting then image to an alpha-less image format). Change-Id: I316cefce8f21797feedebfbf98296ad84eaa4b99 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>