summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Pass events to QGestureManager from the main (GUI) thread only.Friedemann Kleint2014-03-281-9/+12
| | | | | | | | Task-number: QTBUG-20946 Change-Id: I964452c1e97bd3d3a521e33abeb2f7d8cdbc89a9 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/9b28ab3f38e21f2e1498dea5dd761d22d72fb1ac)
* Updated year in copyright headerKai Koehne2014-03-26232-232/+232
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Windows: Restore maximized/full screen widgets to correct screen.Friedemann Kleint2014-03-131-4/+17
| | | | | | | | | | | | | | | | | | | | | Partially revert 54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d and bring back parts from abba37cd0eff959edf2d011842cbf2b36cce8467 which failed some tests on other platforms and never made it in. Avoid setting a geometry on maximized windows since that leaves them in a broken state. Instead, if there is a need to restore maximized windows to a different screen, clear the maximized flag before applying the geometry. [ChangeLog][QWidget][Windows] QWidget::restoreGeometry() now restores maximized/full screen widgets to the correct screen. Task-number: QTBUG-21371 Task-number: QTBUG-4397 Change-Id: Ibd5b736e921f20d4b7365c06c6f9c5dd4469c781 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/ae4243df1e53b0aaeada708f6fa7979a0f0d216a)
* Fix a crash when reparenting widgets on Windows.Friedemann Kleint2014-03-131-4/+6
| | | | | | | | | | Introduced by a9edbeddafe5d8866192de44f4028d07bd93013a . Task-number: QTBUG-37346 Task-number: QTBUG-30276 Change-Id: I81e218839db50a88a8b149dd5481bfd0835284da Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix compile for CarbonAndy Shaw2014-02-071-1/+2
| | | | | | | | Protect the usage of qt_mac_loadMenuNib so it is only used on Cocoa as this call is not used in Carbon code. Change-Id: I93b9b513dce934680e1d5e1fb26bf2a64e25c764 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Win: Fixed assert in QKeyMapperPrivate::possibleKeysOliver Wolff2014-02-051-1/+4
| | | | | | | | | Trying to detect key combinations for events that have an invalid virtual key will fail in any case and does not make sense. Task-number: QTBUG-36061 Change-Id: Ia30cb7bf6c7bae06eb84c23b356a53a2eb6e86aa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Windows: Do not try to update keymap on WM_IME_CHAR messagesOliver Wolff2014-01-311-2/+2
| | | | | | | | Task-number: QTBUG-35806 Change-Id: Ie1082353155aa7ee61f49f2fbcbfdb01d57e797c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from commit 0c09d2ccb9b46138a908950d65a49aa58dd55062)
* Fixed another assert in qwindowskeymapperOliver Wolff2014-01-101-2/+5
| | | | | | | | | | | When we get a WM_CHAR message we do not need to add anything to the key map as these messages already contain the character code in question. Task-number: QTBUG-35532 Change-Id: If73993cd873b7c616876b9ba52ceba6b27a6a7b1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from commit 8e2f95e5a2ebc54c600d1db416b1dd84e433d115)
* Cocoa: fix a typo for F9 in key mappingLiang Qi2013-12-201-1/+1
| | | | | | Task-number: QTBUG-34820 Change-Id: I181f565a0b4f188f83cc821a019cf3781954cb02 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Use qt_mac_effectiveview_for for setFocus_sysSamuel Gaist2013-12-051-1/+1
| | | | | | | | | | | | Currently setFocus_sys use qt_mac_nativeview_for to set the focus which triggers a bug rerouting the key events through NSMenu rather that directly to the correct widget. Get the effective id returns the correct widget. This changeset applies the patch proposed in the bug report Task-number: QTBUG-34371 Change-Id: I0831f41ca409ff309954bb45a50975dd4eb1406a Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fixed assert in Windows key handlingOliver Wolff2013-11-271-2/+8
| | | | | | | | | | | | | | | | | | | | | | Certain key sequences (like press alt, press left, release left, release alt) can cause an assert in qwindowskeymapper. This behavior was introduced in change I4f7709a90906b03f4504deea1ff5c361e9f94b3f (Fix virtual key mapping on MS Windows). The place that seems to cause the new behavior is changing the bitmask for obtaining the event's scancode. With the changed bitmask releasing the alt key in the given key sequence causes the WM_KEYUP event to trigger a WM_CHAR event which should not happen there. To be honest I don't know how having the extended bit inside the scancode fixes the behavior but it seems to do and I could not find another place which might cause the breakage. Task-number: QTBUG-35005 Change-Id: Ia18c2681ea311196441a5cd15017e220ac095674 (cherry picked from commit d4c548ce5c0bd8a70c82ed082bc69fd41e9c47ed) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Juan Luis Boya García <ntrrgc@gmail.com>
* Fix bug in updatePossibleKeyCodes() with dead keys and modifiersJuan Luis Boya García2013-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it was until now, QWindowsKeyMapper::updatePossibleKeyCodes() tested using ToUnicode for which characters produce a key with every possible combination of modifiers. Calling ToUnicode with a dead key is dangerous, because MS Windows keeps it in the driver buffer, so if you call ToUnicode with acute key and then you press a, you get an á. To prevent this, updatePossibleKeyCodes() checked if the key that was being tested was a dead key. If true, it inserted an space and then repeated the key in order to reset the system internal buffers to the same state they were before the call. The problem with this is if the dead key is really two keys (like ^ or ´ in US International keyboard layout) and you press one of those keys without the modifier to make it a dead key (i.e. 6 in US International): Since updatePossibleKeyCodes() only tests for the key that was pressed it gets 6 is not a dead key, and thus it does not execute the workaround. Thus, the next time the user presses 'a' they get 'â' instead because updatePossibleKeyCodes() set the dead key on the keyboard buffer and did not run the workaround. This patch makes updatePossibleKeyCodes() run the workaround if any possible combination of modifiers with the key being examinated makes a dead key. Task-number: QTBUG-33591 Change-Id: I8c0b27586f7c62798986258b1b84aa90e4c5d64c (cherry picked from commit b98a031b813a83374897b23f4f7710a238f2e7b6) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Juan Luis Boya García <ntrrgc@gmail.com>
* Fix virtual key mapping on MS WindowsJuan Luis Boya García2013-11-251-25/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | In order to map MS Windows virtual keys to Qt keys without messing with dead keys now I use the built-in keyMap structure of QWindowsKeyMapper and assert every cell in the keymap is properly updated. In order to guarantee this even when the user changes the keyboard layout, WndProc now manages the WM_INPUTLANGCHANGE message, which is handled by QWindowsKeyMapper, resetting the layout structure. I don't fully understand yet some things about QWindowsKeyMapper, i.e. how QWindowsKeyMapper::updatePossibleKeyCodes workarounds the dead key issue with ToAscii; but it seems to work fine in all the tests I've done. Any further testing is highly appreciated, though. [ChangeLog][[QtGui][Platform Specific Changes][Windows] Fixed virtual key mapping on Windows. Task-number: QTBUG-33409 Task-number: QTBUG-8764 Task-number: QTBUG-10032 Change-Id: I4f7709a90906b03f4504deea1ff5c361e9f94b3f (cherry picked from commit f0d014a16b5c9b55245834459c46ea34d15d14be) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix MinGW-warnings about narrowing/invalid conversions.Friedemann Kleint2013-11-181-1/+1
| | | | | Change-Id: I9b49dd6d12a5e59c6f2674ab3c82a8a7ec583775 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* MinGW: Fix warnings about assigned but not used variables.Friedemann Kleint2013-11-181-1/+0
| | | | | Change-Id: I114483273db0f9ffe0527b4a3e4cd881375a3448 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* When reparenting a widget, children need to reregister as a drop siteAndy Shaw2013-11-151-1/+11
| | | | | | | | | | | If a widget is a drop site and an ancestor gets reparented then the widget needs to be reregistered as a drop site so that it is correctly associated with the new native parent widget. Task-number: QTBUG-30276 Change-Id: I440077e54f614d0bfbaef46104de6598411c986b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Optimize macDisplayColorSpaceMorten Johan Sørvig2013-11-143-0/+12
| | | | | | | | | | | | On 10.9, getting the display based on the rect is slow(er). Use a window -> color space cache instead of a display -> color space cache. Change-Id: If40a6d089019a54ceb724b8007adaffea89c96fb Task-number: QTBUG-34358 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Revert "Return the correct system font on OS X Mavericks."Jake Petroules2013-10-301-7/+0
| | | | | | | | | This fix is broken and a working solution will replace it shortly. This reverts commit 7c4c43afb36449c9fb2d281327423df8eb916d64 Change-Id: I764e7da6e7a52916b87650483271d9aed099ed2b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix the assert failure in QShortcutMap::findGatis Paeglis2013-10-271-0/+3
| | | | | | | | | | | Don't send Qt::Key_unknown down the shortcut handling pipe, because unknown keys are not part of a shortcut sequence and results in an assert. Task-number: QTBUG-30871 Change-Id: Idd451fb793bd07124a96d75ed7b936f7ff584f28 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/c5a6b894e7484544c44a8a415a84e196c4b633c3)
* Windows: Fix tablet position in relative (mouse) mode.Arthur Krebsbach2013-10-161-5/+37
| | | | | | | | | | | | When in "mouse" or "relative" mode with the pen position information would not be calculated correctly resulting in a significant offset between the tablet pen location and the mouse cursor location. Logic was added to detect when the two were not in sync and use the mouse location when this happens. Change-Id: Id3db5f2de0a657a0d072cee95c6b27179ea9182a Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> (cherry picked from qtbase/17ebcd2b4690f73c8fd2332b0ba55b3ee3e2e8bb)
* Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout."Gatis Paeglis2013-09-121-4/+1
| | | | | | | | | | | | | The change which attempted to fix QTBUG-15319 broke keyboard shortcuts for non latin keyboard layouts. This patch reverts QTBUG-15319 (f45cdeda8) since it caused a regression. Task-number: QTBUG-32908 Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7 Reviewed-by: David Faure <david.faure@kdab.com>
* Fix layouts with expanding items with maximum sizePaul Olav Tvete2013-09-101-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layout items with a Preferred size policy would be treated as fixed size if they were in the same layout as an Expanding item (or one with a stretch factor). This occurred e.g. if a layout was configured similar to this: 1. One item with ExpandFlag/stretch but with a maximumSize set, e.g. (100x100). 2. Another item with 'just' GrowFlag, and a maximum size bigger than its size hint. If the above layout was resized to e.g. (200x50) it would cause the expanding item to correctly get the size (100x50), but the 'growing' item would not stretch beyond its size hint. Instead, it would distribute space around both items, behaving as if the 'growing' item was fixed'. The expected behavior is to continue to grow the 'growing' item after the expanding item has reached its size limit. Task-number: QTBUG-33104 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> (cherry picked from qtbase/b855e578044e49b588b32085968c63a910b9daae) Change-Id: I943f1effd53fc7adc19824ce0747443797a0a235 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix QOleDropTarget object leakJian Liang2013-09-031-1/+15
| | | | | | | | | | | | 1) call Release() to nativeExtra->dropTraget in QWidgetPrivate::unregisterOleDnd() to prevent leak 2) call RevokeDragDrop() in QWidgetPrivate::setParent_sys() when the old window handle is to be destroyed and the current widget has already registered an ole drop target object to prevent leak Change-Id: I767f4e0ea3e6cb5f14d72ba88e1f8f1bc8c0dc3c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix unused private field warning in QMacMime.Jake Petroules2013-08-211-1/+1
| | | | | | | Does not apply to Qt 5. Change-Id: Ia1e5c5d8813a2285dd80189f7264d959ea8056c1 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Only release when there is no lock on the objectAndy Shaw2013-08-201-2/+4
| | | | | | | | | | | | | | | | When the widget was unregistered for drag and drop then it would call Release() on the dropTarget before doing anything else. If the widget itself did not have a handle then this was not a problem. However in the case of a widget with a handle then it would call Release() before the lock on the dropTarget was released which would cause it to crash. Therefore it is moved so that it is called after the lock is released to ensure it can be released correctly. Task-number: QTBUG-13237 Change-Id: Iaec3eb8be3a4ea988218012e973f69cbcdcc45de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not send clipboard message to application under debugger.Friedemann Kleint2013-08-191-0/+22
| | | | | | | | | | Fix Qt Creator hang when copying a stack trace from an application showing a runtime assert. Change-Id: I874bd48643ebce1a3551644dc850cb7cf5869522 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/333817b9cf1304cca7c1dbd45880115cd128f60e)
* Link to correct function in QApplication documentation.Mitch Curtis2013-08-081-1/+1
| | | | | | Task-number: QTBUG-26123 Change-Id: Ieb15aac13b27cdbf6a2dfd7c157c366c07e9fb39 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Return the correct system font on OS X Mavericks.Jake Petroules2013-08-051-0/+7
| | | | | | | | Also prints a warning if other private system fonts are encountered. Task-number: QTBUG-32789 Change-Id: I04e1471d25119caddb587972561e98defb1ffda1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix QListWidget item widget scroll bugSamuel Gaist2013-08-051-3/+1
| | | | | | | | | | This fix applies the patch uploaded in the bug report. The patch was provided by Qt-Commercial support but seems to have never found it's way to the sources although the bug was fixed in Qt 5. Task-number: QTBUG-27043 Change-Id: I41c5a7b8f3698bb4396046e5e74863e090ba185a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix build regression caused by 7b7c321d5f35b6ee70db5a72d5d37e19e125d7cf.Jake Petroules2013-08-041-1/+1
| | | | | Change-Id: I54f4e0ca2ca677a41c22183263931c9d65896168 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* evdev tablet support on LinuxShawn Rutledge2013-07-182-1/+4
| | | | | | | | | | Nowadays on at least some distros XInput presents the Wacom and other tablets with the TABLET atom instead of separate STYLUS and ERASER. Task-number: QTBUG-25329 Change-Id: I24d86be63ac2ffdeeb042d91644610feb6c9f4e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Mac: Handle the maximizing of the window ourselves when it is framelessAndy Shaw2013-07-081-1/+8
| | | | | | | | | | | | | | On Mac we need to make a frameless window appear maximized manually rather than letting the underlying Cocoa API deal with it because it would overwise not appear correctly. The test is only done for Mac due to the fact that it is not giving reliable results on other platforms and the source code change is Mac specific anyway. Change-Id: Id48a67ba70bfb4bdc921256f1a80328615c98a6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix Mac static builds so they get the qt_menu.nib from the resource fileAndy Shaw2013-07-081-6/+35
| | | | | | | | | | Instead of loading the file from the bundle (if it existed) then we create the qt_menu.nib from the resources instead. This ensures that static builds no longer have to have the qt_menu.nib file manually copied to be in the Resources folder for every application. Change-Id: I7abb6fad6395d466e22e7a3b7ffb63b50ae82f65 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix leak in QDragManager::drag on macIvan Komissarov2013-06-281-1/+0
| | | | | | | Change-Id: I467129f989b6e28078c9dd789cde7ff898faf1f5 Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QGtkStyle: add getIconThemeName() helper functionDmitry Shachnev2013-06-151-2/+4
| | | | | | | | | | | | | | | | | Add QGtkStyle::getIconThemeName() static helper function (which uses GtkSettings to retrieve the theme name) and use it in QGuiPlatformPlugin::systemIconThemeName() when desktop is GNOME. In modern distributions like Debian and Ubuntu, the /desktop/gnome/interface GConf schema is no longer installed, so the old method for retrieving icon theme name no longer works. Qt 5 already uses GtkSettings for this thing, although the code is in a different place. Change-Id: Ib13d4809b55dd55dc1fa0bc2c4b1552f13feb030 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Cleanup the QDrag when doing a drag with the right mouse button on MacAndy Shaw2013-06-111-1/+4
| | | | | | | | | | When doing a drag with the right mouse button on Mac then it will be ignored straightaway because it will not be accepted. Therefore we need to cleanup the QDrag object as normal so that it is deleted as appropriate. Change-Id: I781fcea7b7c75775adb814090e917363fa7c9189 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Respect specified minimum height for menuBar also if it has HFW.Jan Arve Saether2013-05-151-6/+4
| | | | | | | | | | | | | | | | | | | | If the menu bar is subject to height for width (HFW) we should of course respect that, but in addition we should ensure that the HFW is within the minimum and maximum height. This also is consistent with how QGridLayout calculates the effective minimum row height. This fixes a regression because change 4780f94e391b5e881497c5228661dead turned QTabWidget into a proper height-for-width citizen, and when setting a QTabWidget as a menuwidget, the buggy codepath for HFW was suddenly hit in menuBarHeightForWidth(). Task-number: QTBUG-31057 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> (cherry picked from qtbase/27e690e163408dec1e9c56ffc07131354d4b2c8a) Change-Id: I915d37c69152c1804925000303e82a3fae5a9a47 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Prevent crash due to giving QWidget::update() a large region.Samuel Rødal2013-05-151-3/+8
| | | | | | | | | | | | Similar to what change a298216bb4383dbe96 does for update(QRect) we clip the update region against the widget's rect and return if it's empty. Otherwise we risk ending up with update rects that are larger than INT_MAX due to multiple update rects being merged. Task-number: QTBUG-30876 Change-Id: Idf695b1fdca50449a1e5ddf37500653de290590c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit 69ee30260a667b2b977a0d4b52abf6537521cce8)
* Prevent crash due to giving QWidget::update() a large rect.Samuel Rødal2013-05-151-4/+9
| | | | | | | | | | | | We can simply clip the update rect against the widget's rect and return if it's empty. Otherwise we risk ending up with update rects that are larger than INT_MAX due to multiple update rects being merged. Task-number: QTBUG-30876 Change-Id: I23bd0149fbe8d1a007a60b228e6bddb45dc4fc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit a298216bb4383dbe96688dfb80da0cd875766de0)
* Fixed QLayout::addChildLayout(QLayout *l) when l had a parentJan Arve Saether2013-04-255-5/+19
| | | | | | | | | | | | Previously if l had a parent, addChildLayout would warn and skip the reparenting, but it would still add the sub layout to the layout. This caused some inconsistencies in the hierarchy which in worst case could cause crashes. Task-number: QTBUG-30758 (cherry-picked from qtbase commit 146658a10f290603470b800d71b778239e764312) Change-Id: Iee6ace3189620395d7670007a23783823ed616b9 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix a typo of an internal function nameLiang Qi2013-04-233-4/+4
| | | | | | | | becomeDelegteForWindow -> becomeDelegateForWindow Task-number: QTBUG-30754 Change-Id: Ied7fba42c642deb2c22ff414069659a62cb1a200 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix clang build on Mac OS XDanny Boelens2013-04-191-1/+1
| | | | | | | | | | Clang doesn't like the extra qualification in the forward declaration. Let's move the forward declaration outside of the Qt namespace, which is better anyway since TabletProximityRec is defined in the Apple headers/global namespace. Task-number: QTBUG-29373 Change-Id: Iba59e6592ccbbcc09e91e1b9831a0ee588469b23 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Use [NSScreen backingScaleFactor] on 10.7+Morten Johan Sørvig2013-03-201-2/+7
| | | | | | | userSpaceScaleFactor is deprecated. Change-Id: I892cb579e4b3ef9226495759c884d0e74c85a1d6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add WindowStateChanged eventRafael Roquetto2013-03-065-0/+37
| | | | | | | | | | Not currently considering activation state. backport from qt5 8dc2f81c9f0e6eb8cab09e5d682358fd140b49b8 Change-Id: Ib46e554b08cc8d15f83e9865a8f0be3f8d7b9d16 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QStackedLayout: Fix crash when focus widget is destroyed in hide()Jan Arve Saether2013-02-201-12/+15
| | | | | | | | | | | We also have to make sure that when moving back to a page that has a focusWidget(), the focus should go to the focusWidget() Task-number: QTBUG-18242 Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/18f9eb797bffe8626f1edeca3c88f80dae0da8d7)
* qpa: Fix crash when requesting QApplication::platformNativeInterface()Julien Brianceau2013-02-191-1/+1
| | | | | | | | | | | | If QApplication has not been instantiated, this function would crash. Change it to return NULL pointer instead. cherry-picked from qt5/qtbase 3ee48926e6584b4afeda1fc406d19d7b1a8d6f20 original patch from Miikka Heikkinen <miikka.heikkinen@digia.com> Change-Id: Ic9aae241f9c424fb371ae1774da6a3cb28c31883 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Add missing Objective-C namespace prefixesHalewijn Geerts2013-02-191-2/+2
| | | | | Change-Id: I5d62fcf0880776e290ae739ece81b685bb7af194 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@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>
* 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>