summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
...
* correctly fix compilation of NEON_ASM sourcesOswald Buddenhagen2013-10-181-2/+9
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7a6cee83e15ab8e0b84603d100cafda7a592b126, as assembler files in SOURCES break compiling with -pch, as we don't create a respective PCH. instead, compile assembler code with QMAKE_CC, not QMAKE_CXX. the reason why this change is needed in the first place is not clear to me, but i guess that CXX defines some c++-related macros when preprocessing the file, which breaks further down the line. this is counter-intuitive, as the g++ frontend should treat the same sources the same way as the gcc frontend (differences should be limited the the ld invocation). (partial cherry-pick from qtbase/77196b9dc3caa7dda1072a64ed953bf7231b1af3) Task-number: QTBUG-29765 Change-Id: Ic0116b3a5fa621f12ac41cadf3062ff00b538e85 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Properly paint QListView dragged item in icon modeSamuel Gaist2013-10-182-28/+17
| | | | | | | | | | | | | | | | Currently, when dragging a QListView item in icon mode, only the item is moved and once out of the view port, the visual feedback is lost. This patch updates the QDrag pixmap to have a persistent view of what is moved Based on Qt 5 c3bf3bd8b74187b44ec91582e1cf2be546a73349 Task-number: QTBUG-1180 [ChangeLog][QtGui][QTBUG-1180] Dragging an item outside the QListView in icon mode doesn't lose the icon. Change-Id: I9d7fee4c31a4d3d5467510f16fd573635eb6d6f0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* 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)
* Ensure lastPixel.y is also initalized to -1 when necessaryAndy Shaw2013-10-091-0/+3
| | | | | | | | Task-number: QTBUG-31579 Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from qtbase/f0b950144dde85b65df0c3cf83f7c8df0e94bbbf)
* Add missing variables initialization before requesting png offsetSamuel Gaist2013-09-201-7/+7
| | | | | | | | | | | Initialize all values read to sensible default in case reading them fails. Qt 5 fix commit 0ab3e290c4808f73d46903a5274929e3833d8d3c Task-number: QTBUG-32674 Change-Id: I3a120b5673b67f705a4ebec4359aa52e2392492a Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Compilation fix for libjpeg release 9aavit2013-09-131-22/+5
| | | | | | | | | | | | | In the latest libjpeg version, the "boolean" type is changed so that true and false no longer can be used instead of TRUE and FALSE. Also, purge some ancient code remains meant to support a now defunct OS´s idea about the boolean type. Task-number: QTBUG-33166 Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4)
* 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>
* Windows: Introduce QFileDialog::DontUseCustomDirectoryIconsSergio Martins2013-09-095-11/+52
| | | | | | | | | | | | | | | | | | | | | Folders can have a custom icon, set by the user. Some system folders also have one, for example c:\windows\fonts. This option allows you to disable this behavior, you'll get the folder directory icon. As a side-effect, you'll get a very big performance improvement on removable/network media: 2 seconds vs 60 seconds on a SDCard with 10000 folders. Unlike in Qt5, here we didn't add new methods to QFileIconProvider do avoid introducing new symbols. Change-Id: I0b98a180e53c9ee7d583f19b3917fcc9166cb3eb Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from qtbase/46685f755b01288fd53c4483cb97a22c426a57f0) (cherry picked from qtbase/149f3efc39bebbe8fceacf2553836f90d2e1c383) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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 scrollbar appearance on Win8J-P Nurmi2013-08-231-23/+24
| | | | | | | | (Cherry-picked from qtbase/61948f84da12432b9b8b178875a86f54fef12e32) Task-number: QTBUG-26503 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Change-Id: I1ff92e9f2825e9c0171dbbf5425bb2c997d9cf5a
* OSX: Disable window restoration for the Mac font panelLiang Qi2013-08-231-0/+5
| | | | | | | | | | | | | because if it is automatically restored it's out of the application's control, so the user's interaction will be ignored. Change I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows by default, but the dialog helpers generate windows which aren't affected by that. Change-Id: I46ce3f85ee0c11dca778eb663c87774e322d6b6b (cherry-picked from qtbase commit c9182bc11b77675405941a0a163603cac064d8bc) Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* OSX: Disable window restoration for the Mac color panelLiang Qi2013-08-231-0/+5
| | | | | | | | | | | | | because if it is automatically restored it's out of the application's control, so the user's interaction will be ignored. Change I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows by default, but the dialog helpers generate windows which aren't affected by that. Task-number: QTBUG-31750 Change-Id: Ida063f2d36ab038af5e85de7dfa2acf61cb6dda2 (cherry-picked from qtbase commit 69554e458669c941130c2dc03d42a59ffd00e39e) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@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)
* Sun CC: Fix QFileDialog compilationSergio Ahumada2013-08-161-1/+1
| | | | | | | | | Only use the old getpwnam_r() function when _POSIX_C_SOURCE is defined. Task-number: QTBUG-21451 Change-Id: I6bfc4c9f784616fc08866542c34ed71ab69559e9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add offset reading support in pnghandlerSamuel Gaist2013-08-081-0/+7
| | | | | | | | | | | | This patch adds the offset reading that matches the offset writing in writeImage Qt 5 fix commit 0b62a5d3c931aa4d91b986ec518567e9463a6360 Task-number: QTBUG-32674 Change-Id: I64f7e31049834ecbd052a061b79d3ed97e60e063 Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* 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 double transform for items ignoring parent transformations.Andreas Aardal Hanssen2013-08-051-3/+8
| | | | | | | | | | | | | | | | | | | Previously, the topmost untransformable's scene transform, which includes the item's position and local transformation, was used to determine the item's anchoring position. This position was then passed on to be multiplied by the item's transform again. This works fine for toplevel untransformable items that don't have any transform set at all, but those who do would have their transforms applied twice - one to determine the anchoring position, and again to transform the item itself. Since only translation transformations can affect the first operation (the anchoring pos), this bug only applies to items that set ItemIgnoresTransformations and use a local transform that includes translation. Task-number: QTBUG-21618 Change-Id: I3f3c4f2357e2ca6cd0c75cb5b7e428c0803d9e73 Reviewed-by: Alexis Menard <alexis@webkit.org> Reviewed-by: Jan Arve Sæther <jan-arve.saether@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>
* Cleanup QFileIconProviderPrivate::getWinIcon().Sergio Martins2013-07-251-23/+18
| | | | | | | | | | | | No functionality is changed, just made the code more readable and removed some duplication. Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0. Code in Qt5 is already clean, no commit necessary there. Change-Id: I29fe871eeb0b45b619434e7941cc673033366f63 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Move the declaration of QFileIconProviderPrivate to it's own file.Sérgio Martins2013-07-233-33/+92
| | | | | | | | | | | | | Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0 to Qt4. We can't add new symbols in Qt4 to QFileIconProvider so we will make the private class a friend of the QFileDialog. Change-Id: Ic720d681da14698ecf8557e1223d82bda6b33e23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> (cherry picked from qtbase/f4a0d6d2494d1dd41cd5b854a48b435120714d32)
* 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>
* Consider virtual screen when determining dock widget visibility.Friedemann Kleint2013-07-131-2/+5
| | | | | | | | Task-number: QTBUG-32260 Change-Id: I8b28e3869a6e3b1ed12a311dfa0100979098fc4b Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/6c37fb70d695df001999c78a27ca50d6d2ac6517)
* qpa: Fix memory leak of QFontEngineBox objectFabienne Semeria2013-07-121-1/+5
| | | | | | | | | | | | | | | | Delete QFontEngineBox object in QFontDatabase::load() if the object can not be used. cherry-picked from qt5/qtbase effbc9edc57fd8a2e40729a76004fe4f5fafcf49 original patch from jianliang79 <jianliang79@gmail.com> Modified to match changes in QAtomicInt API. Change-Id: I1cf7398f582c918426a73973347efe4425100eec Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Julien Brianceau <jbrianceau@nds.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fixes: ASSERT in qpaintengine_x11 when using native graphicssystemaavit2013-07-101-1/+1
| | | | | | | | | | | | QFontEngineFT::loadGlyph() was called with wrong number/type of arguments, but as the compiler silently accepted an enum value as a QFixed, and the rest had default values, this was not discovered. Fix not needed in Qt5, since this functionality is not there. Task-number: QTBUG-32166 Change-Id: Ifc5be593530fee5ff0e329a9f56f6ba48eea6cdf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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-082-6/+40
| | | | | | | | | | 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 clipping of QTextList decorators.Leonard Lee2013-07-081-1/+14
| | | | | | | | | | | | | | | | List decorators may be clipped if you set a large font size and/or small indent for a QTextList. This fix is to prevent clipping by moving list decorators and items to left (or to right in case of right to left layouts) so that the list decorator is always painted inside the layout. This commit fixes painting related issue, so auto test is not needed. The manual test program can be used for verification purposes. Task-number: QTBUG-5111 Change-Id: I0de01f4d6b833289948ac29e38dd3cc8ab9bca9e (cherry picked from commit qtbase/ad443dfb1d8e9096c4913686aa2ed0bc9b3f5de7) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* can show the Cocoa color panel repeatedlyShawn Rutledge2013-07-051-0/+1
| | | | | | Task-number: QTBUG-11188 Change-Id: I8491985dd6f04971a7aae2ccf7a53fd7294b799b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix drawing of 0-width polylines from outside the devicerect.Gunnar Sletta2013-07-042-17/+27
| | | | | | | | | | | | | | | This was broken by a previous fix which aimed to fix gaps in polylines with tiny line segments. The result was that we skipped updating the origin point when stroke() didn't produce pixels which accidentally included the case of the line being completely outside the deviceRect. I fixed this by returning the value of clipLine in drawLine to the caller so we could still update the origin for this case. Task-number: QTBUG-31579 Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 (cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) Reviewed-by: Gunnar Sletta <gunnar.sletta@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>
* Doc: remove the duplicate for in QStyle documentationLiang Qi2013-06-201-1/+1
| | | | | | | | | Task-number: QTBUG-31739 (cherry picked from commit 0a55499c9af9a4b0a98a12a8aba82c3764fa5994) Change-Id: I1d2d1bb5ca7a19a8c42f11e944e8339e56df6e4b Reviewed-by: Liang Qi <liang.qi@digia.com>
* Recognize separator item in QMenu.Leonard Lee2013-06-171-2/+2
| | | | | | | | | | | | The mouse over event on upper level menu separator should automatically close the sub menu listing. Manual test is not needed for this commit since it is easy to test it against common examples. Task-number: QTBUG-31664 Change-Id: I6632d0bce27ca064ddfdd05743df969b3e6e02ee (cherry-picked from qtbase/f730cd7542548d7d5fb7cd25f631e471697960c8) Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QGtkStyle: add getIconThemeName() helper functionDmitry Shachnev2013-06-153-2/+27
| | | | | | | | | | | | | | | | | 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>
* QDockWidget: Keep position when undocking.Friedemann Kleint2013-06-141-0/+3
| | | | | | | | | Initialize undockedGeometry to roughly the current position. Task-number: QTBUG-31044 Change-Id: I03cbe280d1215bb58ab721b60e29b45359cde76d Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/0d459619a902e547d8c74745453b3bdb8f67a660)
* 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>
* Only use Vista style for Wizards when on Vista or laterAndy Shaw2013-06-101-1/+1
| | | | | | | | | | If the application is running in XP compatibility mode then we don't want to show the Vista style for the wizard as this will include a back button that should not exist. Therefore we check the platform it is on before trying to resolve the symbols so that it is correct. Change-Id: Ic7249e06461068fe08184a22bb750ab8736ebc3f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix for OS X QFileDialog showing bundle as directorySamuel Gaist2013-06-071-1/+1
| | | | | | | | | | | | | | Also check if the selectedFile is a bundle to correctly set currentDir. This fix does not apply to Qt 5 because QFileDialog has been reimplemented differently and this file does not exist anymore. Task-number: QTBUG-31562 Change-Id: I145108647dd613cb529bb65bc6c7191154dab5b8 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Doc: Fixed typo in QDialog.Jerome Pasion2013-06-031-1/+1
| | | | | | | Task-number: QTBUG-31493 Change-Id: Ie112f601d629c794842d746e7b9c96849c74bdf6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix creating new QWS surface only when it does not exist alreadyPasi Petäjäjärvi2013-05-231-1/+6
| | | | | | | | | | | | Calling createSurface(const QString &key, const QByteArray &data) function is needed when starting/creating new server/client application, and changes to region sizes (and memory allocation) after that is handled by QWS surfaces themself inside setGeometry(const QRect &rect) function. Task-number: QTBUG-31254 Change-Id: I97c78ebe83b2aa9ab9e4ffc8a9987ab2528f8cf1 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Convert the new filename to native separators before checking itAndy Shaw2013-05-181-1/+1
| | | | | | | | | | | If a native separator was put in the new name when renaming a file name via the file dialog then it would correctly fail. But if a non-native one was used on Windows then it would cause the file to be moved instead if the directory existed. Change-Id: If01760b8c54a69b600c9a44c7509017be70d33e3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qtbase/9ec493fa41d06a618d3983c02d9a1141d9d306df)
* 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>
* QGV: fix items not to be selected on right mouse button releaseJ-P Nurmi2013-05-151-1/+1
| | | | | | | | Task-number: QTBUG-30990 Change-Id: Iaf2dd7ed496625097daa05d5dc92ef5957574ee9 (Cherry-picked from qtbase/0b862e067756132225e33be09670631edd50d944) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* 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)
* Widgets: avoid integer divide by zero in QProgressDialogLiang Qi2013-05-151-0/+1
| | | | | | | | | | | Autotest is included. Task-number: QTBUG-31046 Change-Id: Ief7d71b58e7a5416f3659f19445e5d729849b3b6 (cherry picked from commit 69c05bbef47fb9d30d70e594bd5942add8b135fe) Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>