summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
...
* qwidget_win.cpp: Initialize WINDOWPLACEMENT correctly.Friedemann Kleint2014-07-281-0/+1
| | | | | | Task-number: QTBUG-40466 Change-Id: I93ff7977d68d36bc89f98d6a43c103a2a8d730f7 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Fix compilation of QWinInputContext with Q_IME_DEBUG defined.Friedemann Kleint2014-07-281-13/+13
| | | | | | Change-Id: I4f96b8ff57957e3cc370e5b1f37a036a619ce3f9 Task-number: QTBUG-40402 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Mac: Fix mixing unified and non-unified toolbarsDavid Garcia2014-06-181-1/+1
| | | | | | | | | | | | Test if the target toolbar is actually a unified toolbar before calling the special MapFromParent function. This change is not needed in Qt 5. Task-number: QTBUG-36100 Change-Id: I37fce89c79f5fce057e0b31d4c4f2e72269cdb06 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* fix compilation errors with OS X 10.7 SDK or later for the Carbon flavorAshish Kulkarni2014-06-161-0/+56
| | | | | | | | Some deprecated functions have been removed from the the 10.7 SDK, but the symbols are still exported by the 32-bit libraries. Change-Id: I5e7843db02f9fdb6288425ce32574b43087958ce Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Windows: Added Comma to list of possible numpad keysOliver Wolff2014-06-121-0/+1
| | | | | | | | | | | Some keyboard layouts (German and Czech for example) have comma instead of period on the numpad, so this key should also be considered when setting the Qt::KeypadModifer state. Task-number: QTBUG-38248 Change-Id: I06847a02a9334c21784790eae6fd7e1bc6de4099 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from commit 7e44e4bb4e23758be7c05261e0413365491c6846)
* Cleanlooks style: Fix floating point exceptionAlexandre Rostovtsev2014-06-071-1/+1
| | | | | | | | | | | | | | | | In QCleanlooksStyle::drawControl, if indeterminate == true and rect.width() == 4, we will end up with slideWidth of zero, and take a mod by zero when calculating the value of step. This causes a crash in Quassel 0.10; see https://bugs.gentoo.org/show_bug.cgi?id=507124 Instead, calculate slideWidth based on max(width, minWidth) where minWidth was already set as 4, ensuring that slideWidth >= 2. Change-Id: I6678789105e359fa26c99409f449cad0ba3bd0ae (cherry picked from qtstyleplugins/8ff2ac6035fb1d01f5c0054ba14afb949410e3a7) Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QClipboard Windows debugging: fix compilation with VS2005.Samuel Gaist2014-06-021-3/+3
| | | | | | | | | | This patch based on Qt Creator allows Qt 4 to be built using VS2005 [ChangeLog][Windows] Fixes build with MSVC 2005 Task-number: QTBUG-39133 Change-Id: I413beb063b5d1f458cfa26f54f6bbd2de9240380 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix raster graphics on X11 RGB30Allan Sandfeld Jensen2014-05-261-1/+1
| | | | | | | | | | | The window surface incorrectly assumes that any pixel depth of 24 or above would be on 8bit/color. This breaks 10bit/color formats like RGB30. This patch instead make it specifically check for color depth 24 or 32 which are the two with 8bit/color. Task-number: QTBUG-25998 Change-Id: Id0b7e07bdb64679f8c647158938da12efede9142 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Tslib QWS: also apply missing release coordinate code to non-raw modeRolf Eike Beer2014-05-151-2/+2
| | | | | | | Even if the normal mode is used the release events may have zero coordinates. Change-Id: Ia9de05928ab5dfc225665e3b2c9a4d42f6ba984e Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Memory and file descriptor leak in QFontCacheSimon Yuan2014-05-146-84/+55
| | | | | | | | | | | | Make the cache also use the ref counts Make everyone who decrements a ref count check for 0 and delete Move all cache logic to the cache Same idea as 36cb3f3 and b3dae68 in Qt 5 without the extra stuff Task-number: QTBUG-38035 Change-Id: I27bea376f4ec0888463b4ec3ed1a6bef00d041f8 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Windows: Add missing colors to tooltip palette.Friedemann Kleint2014-05-091-0/+4
| | | | | | | Task-number: QTBUG-38183 Change-Id: Ic3581cc87c0d61140624ddaf6fa85d682120ad4f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/9fc0c5466238eb8f43d2736d298ac36c65da529e)
* Fix visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-071-9/+2
| | | | | | | | | | Determine the visual index by looking up the column of the QModelIndex in the logicalIndices array instead of looping. Task-number: QTBUG-37813 Change-Id: I5c3c73c67537877b03cdc2c36a52041d99f7f49d Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from qtbase/85aef2dd4b059d2ba9cba4605d9fef87f3e2c4fc)
* Don't crash on broken GIF imagesLars Knoll2014-05-061-0/+7
| | | | | | | | | | | | | | | | Broken GIF images could set invalid width and height values inside the image, leading to Qt creating a null QImage for it. In that case we need to abort decoding the image and return an error. Initial patch by Rich Moore. Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 Task-number: QTBUG-38367 Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a Security-advisory: CVE-2014-0190 Reviewed-by: Richard J. Moore <rich@kde.org>
* QMdiArea: Ignore events of other instances in the event filter.Friedemann Kleint2014-05-061-0/+3
| | | | | | | | | | | | This caused for example the variable QMdiAreaPrivate::isSubWindowsTiled being cleared from another instance, which resulted in odd resizing behavior. Task-number: QTBUG-31448 Change-Id: I880f7e415d6654e52499df1bfaf99f2c55d86320 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/9e2c4bc67f30eb1e8d776afe3a092d5994aaab38)
* fix include of private headerMark Brand2014-05-031-1/+1
| | | | | Change-Id: I0554933de2536231d7d416d8df5b96eaa459fc51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Vista Style: More menu item pixel fixes for QtQuick ControlsGabriel de Dietrich2014-04-221-2/+2
| | | | | | | | | | | | Includes a one-pixel fix for widgets, where the menu item text would be one pixel too far away from the vertical gutter. Task-number: QTBUG-37451 Task-number: QTBUG-38376 Change-Id: I2539233814a427c5bed66a5c07584717eb3df418 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> (cherry picked from qtbase/9cd2dac348f45c4b93f74f8ebe20d7528821f003)
* OS X: Make Qt application react on applicationShouldHandleReopenSamuel Gaist2014-04-171-0/+13
| | | | | | | | | | | | | | | Currently a click on e.g. the dock icon is not propagated to the application so if for example the main widget is hidden, it doesn't come back. This patch fixes it Task-number: QTBUG-10899 [ChangeLog][QtGui][OS X] Fixes a bug where clicking on the dock icon would not be propagated to the application Change-Id: Ia02ca23ed0dafbd337d1d7d9bc5f7efe3843b512 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix crash when deleting top level windows embedded into QGraphicsProxyWidget.Friedemann Kleint2014-04-151-0/+4
| | | | | | | | | | | Clear proxyWidget pointer in slot QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot(). Task-number: QTBUG-29684 Task-number: QTBUG-33213 Change-Id: Ibdbd52aa810ca908e3d98daa00954345e7a93a48 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> (cherry picked from qtbase/ff2dbe609ef4482d66d1ecd135b4f53f6aff7e60)
* Fix crash when trying to place toolbar into zero-height window.Friedemann Kleint2014-04-103-20/+32
| | | | | | | | | | Change QToolBarAreaLayout::item() to return a pointer and check return values in plug(). Task-number: QTBUG-37183 Change-Id: I7029eb9739cbe603460e87d3e5493f116bdb3a89 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> (cherry picked from qtbase/e38ad9455099a83e2a8619f19ca949bc64ae6f82)
* Avoid out of bounds memory reads when scaling imagesv4.8.6Lars Knoll2014-04-036-27/+45
| | | | | | | | | | | | | | | | | | The calculation of the width/height required for the scaling algorithm was prone to floating point rounding issues, where the lower value got rounded down, the higher one rounded up. This could lead to a situation where we iterated over one more line/pixel in the line than we have in the source image. Correct this by passing the dimension of the source image into the function and bounds checking the values before iterating. Backport of If44b2235a479224660d508a0504fec40d724763a from Qt 5 Task-number: QTBUG-35927 Change-Id: If145ee715a143b889538243f45227d8d78a0050f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* 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)
* printsupport: set duplex setting correctly to CUPS printerTeemu Katajisto2014-03-281-14/+14
| | | | | | | | | | If CUPS printer default is not DuplexNone then setting duplex to None for printer did not have any effect on duplex setting. (backported from qtbase/385e584926f2957d6e9ec4c2c4e89b37a5e0c80c) Change-Id: Ia72f599a9e5fa511b3214c6b8016e21f40409b86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QPrintDialog OSX: don't crash if ApplicationModal and no parentShawn Rutledge2014-03-281-1/+3
| | | | | | | | | | Task-number: QTBUG-32464 (backported from qtbase/03855decfcb4e05817424843564a4b66636bb347) Change-Id: I12892798419b2efcf404f972930562d50d045ea3 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QPrintDialog: document the modality on OS X and WindowsShawn Rutledge2014-03-281-0/+4
| | | | | | | | | | | | You can't programmatically close the dialog because it's modal. Task-number: QTBUG-32464 (backported from qtbase/bd602a2dc4bc9491f80919b09a8990edb6fbee97) Change-Id: Ib7573b347b3f10914e60af05f95ed9f5763eadd8 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Updated year in copyright headerKai Koehne2014-03-261250-1251/+1251
| | | | | | | | | | | | | | | | | | 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>
* QPushButton: draw label using the stylesheet's font.Mitch Curtis2014-03-211-0/+8
| | | | | | | | | | | | The RenderRule for the stylesheet has the correct font information, it just wasn't being set on the painter that draws the label. This is a backport of the Qt 5 commit: 9ad768fd1999780df18551151b9d9fa9c354131c. Task-number: QTBUG-8990 Change-Id: I4857d6e17b62980782ca7bfdfd0a571a9950f635 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QMenu: Sloppy menu selection should allow hovering separatorsGabriel de Dietrich2014-03-201-0/+1
| | | | | | | | | | | | | | | Setting the current action to 0 clears the sloppy region and closes the submenu if we hover a separator on the way to the submenu popup. Now, we choose not to while the sloppy delay timer is running. This is a backport of I9d1b1358fe64c259dc47f35db8fc8f2b19a73153 from qt/qtbase. Task-number: QTBUG-20094 Change-Id: If4b3cff05a9bcb41cee3e49490d4cc5fc3595821 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMenu: Enable sloppy submenu mouse navigationGabriel de Dietrich2014-03-204-7/+16
| | | | | | | | | | | | | | | Since we're in the 21st century, we set QCommonStyle to return true to the SH_Menu_SloppySubMenus style hint. This unlocks all the logic already available in QMenu. This is a backport of I134c87e348d98d1f46055e0bfef2b4a4a3d2993a from qt/qtbase and includes some previous enhancements. Task-number: QTBUG-20094 [ChangeLog][QtWidgets][QMenu] Enable sloppy submenu mouse navigation Change-Id: If4141a3d849123850e40af92ac5aede9ed767bdf Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMenuPrivate: Make sloppyDelayTimer non-staticGabriel de Dietrich2014-03-202-7/+6
| | | | | | | | | | | | | | | Keeping the timer static would trigger warnings when enabling SH_Menu_SloppySubMenus in QCommonStyle in a forthcoming patch. This would happen if we opened a second level submenu quickly enough and get the mouse event handler to reset the timer its parent menu started. This is a backport of Ia768603b40b219f87138c60a595c65ef408761ae from qt/qtbase. Change-Id: Ia7e9a94b3445d9362a60a36d5e4dda878ab0f7a5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QWindowsXP/VistaStyle: Fix detection of item view delegate line edits.Friedemann Kleint2014-03-173-15/+17
| | | | | | | | | | | | | | The old code tried to check the 2nd parent for inheritance from QAbstractItemView. This also triggers for line edits on a QDialog parented on the item view. Introduce convenience function that checks for top levels in the chain. Task-number: QTBUG-37504 Change-Id: I932f8efdb4764e9b1eea84c802bf7e8718338e1d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from qtbase/176342e70a1ba7864a5b5dac14d12d4091ef5bd9)
* 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>
* Mac: Fix file dialog filters when filter doesn't start with '*'Eike Ziller2014-02-131-1/+2
| | | | | | | Task-number: QTBUG-17326 Change-Id: Ie32f2807e64aa9c90b2e7d75adcd2aef67649225 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* fix crash when using GTK 2.14 function in old gtkAndrey Volkov2014-02-131-1/+3
| | | | | | | | | | | | | | | | | | | This is additional fix for bug 23569. Previous fix (SHA1 7fcf1cf674d09d9dd1d41e2913252017f1d599ca) is not enough. QGtkStyle was still crashing with old gtk (< 2.14) in drawComplexControl () function. Bug was reproducible on CentOS 5.x and Red Hat 5.x. Current patch makes the same check as in commit mentioned but in another line of code. Task-number: QTBUG-23569 Change-Id: I261b61bc93ccaada879ed02ad4d0bef62935335b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Harri Porten <porten@froglogic.com> (cherry picked from qtbase/7df3321f934e5bd618e2ad00bf801f2b7edd31df)
* Fix the Carbon buildAndy Shaw2014-02-111-0/+6
| | | | | | | | | The function does not exist when building for Carbon with the 10.5 SDK so since this means the function will effectively do nothing, so we just return false in this case. Change-Id: If41762a055ebeccfcfce751e164b6a6e7e1db437 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@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>
* DontUseNativeDialog is not just for the Mac color dialogShawn Rutledge2014-02-051-2/+2
| | | | | | Task-number: QTBUG-14341 Change-Id: Id2e8df9277186427370fa2a89643995d79812704 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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)
* QWindowVistaStyle: Always initialize text color of menu items.Friedemann Kleint2014-01-221-6/+4
| | | | | | | | | | [ChangeLog][QtWidgets][QMenu][Windows] Correctly use text color set by style sheet for menu items. Task-number: QTBUG-36142 Change-Id: I142f2fd82164771b45bf599a6afa1121fcfd2187 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from qtbase/b152b425f74788b2f2845fb7d1a5032d86b8746d)
* QWindowsVistaStyle: Fixed position of menu gutter when using a custom widget ↵Friedemann Kleint2014-01-221-2/+4
| | | | | | | | | | | | | | | | | action. The gutter position was hardcoded to 28 which fits when drawing on the QMenu with a left margin of 3. It became offset when drawing on a custom widget with no margin. Calculate position relative to margin for left to right. [ChangeLog][QtWidgets][QMenu][Windows] Fixed position of menu gutter when using a custom widget action. Task-number: QTBUG-36218 Change-Id: Ibb34a9fba2bab7257482b80d2e51e76a9755345c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/a5c288ea5675a382edf0b3ecae42f461a22a7303)
* QWizard: Fix frame when using Vista style/MSVC2012Friedemann Kleint2014-01-172-8/+32
| | | | | | | | | | | | | | Work around GetSystemMetrics() returning the wrong value using MSVC2012 and later. The special handling of Windows 8 and later is then no longer required. [ChangeLog][QtWidgets][QWizard] Fixed frame when using Vista style/MSVC2012. Task-number: QTBUG-36192 Change-Id: I39c2ab70a266f12cd65fa740b10b86edffa60417 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/852308114ff901b86cca99268f498fc1d56b622e)
* Correct wordwrapped text handling in QListView icon modeSamuel Gaist2014-01-152-1/+9
| | | | | | | | | | | | | | Currently a QListView with wordwrapping activated will wrap the text only to the width of the icon even if the grid size is bigger. With this patch the option rect is now updated to match the grid size if valid and the style uses it to determine the correct size when wrapping [ChangeLog][QtWidgets][QTBUG-4714] Use the grid size for wordwrapping when available in icon mode Task-number: QTBUG-4714 Change-Id: I2cb63809d3ee8bd262f38bc11de91df9ff5cf237 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qtbase/a761be2fb2191215426f904cb03df0e966214531)
* Avoid floating point exceptions in rasterizeLine.Gunnar Sletta2014-01-121-16/+45
| | | | | | | | | Task-number: QTBUG-16757 Change-Id: I3ef988f1e039c12529d62197d85a62f201e4ae12 Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from qtbase/85b4f0d2d3ffd326548ca8f0e15ac27f5fd8d77d) Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* 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>
* QSpinBox: fix cursor jumping around when pressing up/down keysPekka Vuorela2013-12-171-4/+8
| | | | | | | | | | | | | | | | | | | | Backport of: Make QLineEdit unit test pass again Widget failed to update cursor position if selection remained the same, but changed direction, and did not emit selectionChanged if change resulted from input method event. Bisected to fix Task-number: QTBUG-15116 a regression introduced in fb7d86cf. Change-Id: I6a4ae48d41efa5e126980749f89982f92e3ec499 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from qtbase/1189ebff320b8dd03637947c92df6e3ef84a3c06) Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Clean up a partially scrolled QRollEffect widgetMiikka Heikkinen2013-12-091-1/+1
| | | | | | | | | | | If the associated widget pointer got zeroed while QRollEffect was scrolling, the partially scrolled QRollEffect widget remained on screen indefinitely as 'done' was never set to true. Change-Id: If1567ea740e81b5501137d10db471ca97d295ed8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from qtbase/486601fbc4a7e9eaeb5df5bb3966c3aec31d8d65) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* Respect the custom paper size settings on MacAndy Shaw2013-12-042-23/+48
| | | | | | | | | | | | | | | When the user added a custom paper size then it would be silently ignored when printing on Mac. This now ensures that it is respected when appropriate. Manual cherry-pick from Qt 5: 26a0a3ed85008c3a0edae125fca48c7c36a7437f [ChangeLog][Platform Specific Changes][OS X][QtPrintSupport] Respect the custom paper size settings when printing. Task-number: QTBUG-34700 Change-Id: If2ff9b704a636c94510f826d300e53af99c8e7ab Reviewed-by: John Layt <jlayt@kde.org>