summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Use metrics returned by GetGlyphOutline in GGO_METRICS modelasconic2014-12-161-3/+26
| | | | | | | | | | | | | | | GetGlyphOutline Windows API returns wrong values when used with an OpenType PS font and in GGO_NATIVE mode. It causes problem when exporting to PDF. The fix changes the GetGlyphOutline call to use GGO_METRICS instead. Task-number: QTBUG-12799 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Change-Id: I38ca46d50e490e3b704a89d08b1a8697bca5f079 (cherry picked from qtbase/4aba2d07d2fe67beaf544a4b38c5b9aa8b8ec39b) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix OpenType fonts with cmap tables on WindowsJosh Faust2014-12-132-3/+11
| | | | | | | | Task-number: QTBUG-31656 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Change-Id: If941bddb6173b6bd93117ba5bd35fa4050f29e3d (cherry picked from qtbase/0a170be576153b84ee6249f1a2b7cbce1ef10d84)
* Make distance fields rendering work with Opentype CFF fontsEskil Abrahamsen Blomfeldt2014-12-132-1/+14
| | | | | | | | | | | | | | If the font has a CFF table, GDI will not label it as TMPF_TRUETYPE, however, we can still use GetFontData to get the SFNT tables. This is required to get the maxp table which contains the glyph count, which is required to use the font with the distance-field renderer. Task-number: QTBUG-28746 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Change-Id: I1e084f7e9dbd0bccb9b1ff4de2eaf65d6a5f9f1e (cherry picked from qtbase/dde09c429ae8b7ad0df4e4b36b8459d2b85a1219) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix glyph's CMAP index might be corruptedKonstantin Ritt2014-12-131-1/+1
| | | | | | | | | | | when SMP sybmol is present in the font. this is a simple typo fix, actually Change-Id: I34fc01171f2893d36d36cc929b4f1a789a5f36db Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from qtbase/51998eb4f65b92640176973ba0e0ed14adee561d) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fixed a bug where spans did not always work in layouts.Jan Arve Saether2014-12-101-1/+1
| | | | | | | | | | | | | | | | | The problem was that the span we stored in the multiCellMap was the "effective" span (i.e. the given span subtracted with the number of ignored rows it would span). Later we used that span to distribute its size across all its cells. However, since the span now could be smaller that the given span, we could sometimes fail to distribute to the last span(s). [ChangeLog][QtWidgets][layouts] Fixed a bug where spans sometimes didn't distribute themselves to the last cells they covered. Change-Id: I7bfbbe721f0ec4398be6a5f234c109ddfec18514 Task-number: QTBUG-43099 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> (cherry picked from qtbase/c9db6e52bc9bd9731159fcb4e95fca5cba01bc9c)
* Windows: Fix return value of QDesktopServices::storageLocation(DataLocation).Friedemann Kleint2014-12-041-6/+7
| | | | | | | | | Return empty string if SHGetSpecialFolderPath() fails for DataLocation, ie, the directory does not exist. Change-Id: I2abf41174b904fe36e587894832c0f3f4947dc1e Task-number: QTBUG-43092 Reviewed-by: David Faure <david.faure@kdab.com>
* Rewrite debug output of event classes.Friedemann Kleint2014-12-031-242/+359
| | | | | | | | | | | | | | | | | | | Bring debug formatting in Qt 4 on par with Qt 5.4: - Introduce functions to return class name and type name by type. - Add verbose output for DnD, tablet, native gestures and context menu, events. Task-number: QTBUG-38858 Task-number: QTBUG-42344 [ChangeLog][QtGui][QEvent] The debug output for events has been significantly improved. Change-Id: I3f11e34c3c9d6a3c6db596be4051b801f00e6153 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> (cherry picked from qtbase/14f9c09542bd6cc19430473da9ce4c68f239ec7d) Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Auto-scroll while selecting entire rows/columns did not workJan Arve Saether2014-12-031-2/+4
| | | | | | | | | | | | | | | | If you press and hold a section in a header view you can extend the selection to more rows by moving the mouse. This worked fine until you moved the mouse outside the geometry of the header view. The expected behavior was then to scroll the view (this is what happens with extended selections on regular table cells). [ChangeLog][QtWidgets][QHeaderView] Auto-scroll the view when making extended row/column selections. Change-Id: Ic65aa34d370e74054b2123ab57edb1add0e8adb9 Task-number: QTBUG-21201 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> (cherry picked from qtbase/f9408317e70bc2e635a2f9baeff35d1c06227734)
* Adjust the layout if a QGraphicsWidget is explicitly hiddenJan Arve Saether2014-10-313-1/+14
| | | | | | | Task-number: QTBUG-20132 Change-Id: Iab59fc9b61d4ca1bb2208c479a027da6eb0283a9 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> (cherry picked from qtbase/bf200fc948d89e1a735a8bcca879654028f944d2)
* Fix license text and URLs in QMessageBox::aboutQt().Friedemann Kleint2014-10-201-14/+14
| | | | | | | | | | | Point to new qt.io site, adapt licensing text. Task-number: QTBUG-41798 Change-Id: I492df6a842c2b31e44653fb4388408c209f24f1e Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> (cherry picked from qtbase/4a2cf9ca4174ee9879bfc5858f10dacc028a521f) Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QTreeView: speed up isRowHidden for the case where no rows are hidden.David Faure2014-10-131-0/+2
| | | | | | | | | | isPersistent(index) is a linear search, which we can avoid altogether (as well as the creation of a persistent model index, is idx is indeed persistent) when the row-hiding feature isn't used at all. Change-Id: I55ef204dd9b79a89d51d5d3aacc1c110d37a4ea0 (cherry picked from qtbase/cd824ee79188b889df85d4d648a625589655e15e) Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* [OS X]: respect icon visibility preference in system tray menusRené J.V. Bertin2014-10-091-1/+1
| | | | | | | | | | Check the `IconVisibleInMenu` switch so that systray menu items only show an icon if the application/user has configured things that way, and not otherwise. Task-number: QTBUG-41348 Change-Id: Ibb7db326fd598ca78cb95c815b5e165de2babeda Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QMacStyle: Fix QTabBar appearance on YosemiteJari Tenhunen2014-10-071-10/+19
| | | | | | | | | | | | The selected tab text color should be white except when the window is not active. Also, no text shadow should be rendered in any case. Finally, there's no need to move the tab shape up anymore. Backport of qtbase/e9e66079b16754f1fef89c2ad93593d7d55c8654 Change-Id: Ib41b9ccb990dc5c550f5a48c855bebd39262b06e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Backport: use backslashes for UNCs pathSamuel Gaist2014-10-011-16/+23
| | | | | | | | | | | | | | | | | ShellExecute fails to open a share folder due to using '/' instead of '\'. Windows API doesn't support forward slashes for extended-length path. Extended-length path are path that start with a "\\?\" prefix. For example, "\\?\c:\very_long_path\foo\bar.txt", or in the case of a UNC path that would be "\\?\very_long_path\foo\bar.txt". [1] [1] http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx#maxpath (cherry-picked and adapted from qtbase/18c916517f3004d34482c20ed66bf09ec274d385) Task-number: QTBUG-13359 Change-Id: I2f38ecb76d87b87dc1d40bd48c94c78550a6ca1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QLineEdit: Disable standard key 'cut' when there is no selection.Dyami Caliri2014-09-291-1/+1
| | | | | | | | (cherry-picked from qtbase/0aa84a619ea0a7c85a1ed48ed28817d4c7e40b33) Task-number: QTBUG-40477 Change-Id: I48aa7ecc4ee8a8e4e9feaf9b6cba5109d2d1f725 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* OSX: make QFileDialog::getSaveFileName honor the initial file name.Erik Verbruggen2014-09-161-1/+1
| | | | | | | | | | | | | Since OSX 10.9 the NSSavePanel will call panelSelectionDidChange on the delegate when the selection is changed programmatically, even when the panel is not (yet) visible. This overwrites the selected file name with the default "Untitled" before we'd set it in runApplicationModalPanel. The fix is to check if panelSelectionDidChange is called before it is shown. Change-Id: I9ad6cd3afddc0aac35baebab31fd85cd7bf3f9e9 Task-number: QTBUG-36212 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QPdf::addImage(): avoid a QImage detach when it's in an acceptable FormatMartin Pley2014-09-111-3/+3
| | | | | | | | | | | Don't detach QImage, when it's in Format_Mono or Format_ARG32. Use QImage::constScanLine() instead of QImage::scanLine(). Change-Id: I30fcafb576aea3189637a40fd75f77c70017ba46 Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> (cherry picked from qtbase/1a32cc0ae42a4a49f2d45b8ad8251ec40a30bf76) Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QListView: Catch stack overflow on mutual scrollbar calculation.Lars Knoll2014-09-101-2/+32
| | | | | | | | | | Backport of fc4993be1fa7673016b6e5d81134463f163051f6 from Qt 5. Task-number: QTBUG-39902 Task-number: QTBUG-38517 Change-Id: I66b2c7304423dd65d67158ae0dc70ad12e4fa783 Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix font cache check in QFontEngineFT::recalcAdvances()Miikka Heikkinen2014-09-091-1/+3
| | | | | | | | | | | | | | Cached font was used regardless of the format, resulting in incorrect advance in some cases when default format differed from the cached format. Task-number: QTBUG-24188 Change-Id: I39e4156bd9ba743afa7e106e934c90227fbf2b8b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> (cherry picked from qtbase/2ea976c3a713535c2419d936d575e0b24545f0fa) Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* Revert previous QFileDialog fix for SolarisSamuli Piippo2014-09-051-1/+1
| | | | | | | | | | | | | | | | This reverts previous commit 6d47f5a168e350a6d9cbddb343ff9d75ffbd2c04, that broke compilation of QFileDialog in solaris (Sun CC). Solaris defaults to Draft version of getpwnam_r if _POSIX_C_SOURCE is not defined or < 199506L, and _POSIX_VERSION is defined as 199506L even when _POSIX_C_SOURCE is not used, so it cannot be used to detect correct posix support. Task-number: QTBUG-21451 Change-Id: Ibbf2b9de1dea74e7d8b6003d1a4e3686e5858525 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* QSwipeGestureRecognizer: Use qAbs() to check distances.Friedemann Kleint2014-09-041-1/+1
| | | | | | | Task-number: QTBUG-15768 Change-Id: Idc6c6687430365a015fb2c15f4e4dcae6a687f9f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> (cherry picked from qtbase/74303ad497ff0e3a9876d349e2ce2f67f08c0fbf)
* Don't call virtual methods after the source model is destroyed.Andreas Hartmetz2014-09-032-1/+3
| | | | | | | | | | | | | | | Calling clear_mapping causes the persistent indexes to be queried, and mapped using map_to_source, so that they can be restored later. That is not the appropriate response to the source model being deleted because there won't be anything to restore. Simply clear the stored mapping information instead so that the source model actually exists when mapToSource is called by the framework. Backport of 722798a359761a1eb635d18547b076615f192508 from qt5/qtbase Change-Id: I9c74f97855046b968dfba7a35134c234b974e63b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Replace all ocurrences of NSApp with [NSApplication sharedApplication].Jake Petroules2014-09-0116-88/+89
| | | | | | | | | | The former returns an id and the latter returns an NSApplication*. This gives us the benefits of static typing and resolves a build error on OS X 10.10. Task-number: QTBUG-39644 Change-Id: I62939b168f391beb846f8a1c5ae789e45bceb858 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix QPainter::drawPolyline() painting errors with cosmetic penaavit2014-08-291-4/+4
| | | | | | | | Task-number: QTBUG-31579 Change-Id: I8fd2c03ff9a22e4963bfcbcfe196ae4c61b9e10f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> (cherry picked from qtbase/319cbb7597100f3b65792dc6a0ce2885ce6c0e8c) Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QMacStyle: Fix focus frame rendering in YosemiteJari Tenhunen2014-08-201-5/+14
| | | | | | | | | | | | | | Using the HITheme API would result in the frame's right edge to be missing. Instead, we use the recommended technique to draw the focus ring around a custom NSCell. (See https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/ControlCell/Articles/ManipulateCellControl.html) Backport of 769af6689337285927a2637b184149f688332542 from Qt5/qtbase Change-Id: I8f3992edc065e14632ec4e473732b30bcf4c1937 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac Style: Fix QLineEdit frame in 10.10Jari Tenhunen2014-08-191-10/+8
| | | | | | | | | Also removes some dead code. Backport of 83f06da1c6bffff61af78cbe75a0691d53742b53 from qt5/qtbase Change-Id: I7e088ca8b52bc3e2da25e29ab570469eab6f97bf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove use of 'register' from Qt.Kevin Funk2014-08-118-96/+96
| | | | | | | | | | | | | | | It is deprecated and clang is warning about it [-Wdeprecated-register]. Original patch from Stephen Kelly, see commit d9fb6e6dbb2b322556d581265da2442e3b91a6a3 in qt5/qtbase This is a backport of this commit + additional manual replacements in header files. There are still some 'register' uses inside implementation files left, but headers are all 'register'-free now. Change-Id: I7225381df1f093073583d62fa86f7bd7cca869c7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation warnings due to superfluous commas at the end of enums.Robert Griebl2014-08-052-4/+4
| | | | | Change-Id: Ibc05eec8a109d68cfa2caa64ea069d77c456c41e Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Don't convert signed to unsigned when we need all 32bitAllan Sandfeld Jensen2014-07-301-2/+2
| | | | | | | | | | | | | | The fast scale methods qt_scale_image_16bit and qt_scale_image_32bit were incorrectly assigning an unsigned value to a signed variable, which broke their support of images with dimensions from 32384 to 65535. Images with dimensions higher than that are already using another code- path. Backported from change 0afc80c9225ca9630f627fe1aea3d4fd7f958082 in qtbase Task-number: QTBUG-40297 Change-Id: Ib55f7f9294f03a2f81206130e665af452f8cd085 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* 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)