summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Add Missing Debug Operator Declaration for QTouchEvent::TouchPointv4.8.7Kalle Viironen2015-05-061-0/+2
| | | | | | | | | Debug operator for QTouchEvent::TouchPoint was added in fa81aa6d027049e855b76f5408586a288f160575 but that commit was missing the declaration. Change-Id: I1bce5f131c5995e0696babe3172cbba95704ac5d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* OSX: avoid crash in invalidateBuffer_resizeHelper on parentless widgetRené J.V. Bertin2015-04-211-1/+1
| | | | | | | | | | | | KDE4 has a KMenu::addTitle function that adds a distinctive item to a menu, as the predecessor to Qt5's QMenu::addSection. On OS X this function leads to a null pointer access because invalidateBuffer_resizeHelper is called on a parentless widget. This patch filters out such widgets. Task-number: QTBUG-41716 Change-Id: I8f62a14d201ce44e038ceff87ee5db98277f1b87 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Doc: Update obsolete external URLsTopi Reinio2015-04-114-4/+4
| | | | | | | | Update external URLs in the documentation for links where the resource is still available online. Change-Id: I99e5d6d7e030f93c3fe8d31cf300077e2897649e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAkseli Salovaara2015-03-311255-16279/+16278
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Identify XButton1|2 release events when mouse is moving.Matteo Bertini2015-03-261-0/+6
| | | | | | | | | | | X11 has no special state for XButton1 and XButton2, so we need to look at the global `mouseButtonState` and restore the buttons after a mouse move. Task-number: QTBUG-40148 Change-Id: I789f32b344cf7902b1c7aa6b7da7f20f32602be2 Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Use qSwap instead of std::swap so platforms without STL still compileAndy Shaw2015-03-201-1/+1
| | | | | Change-Id: Ieee4c1e795b13b3c2fd26d05c5655b4b596bd061 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Fixes crash in bmp and ico image decodingEirik Aavitsland2015-03-131-6/+7
| | | | | | | | | Fuzzing test revealed that for certain malformed bmp and ico files, the handler would segfault. Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe (cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078) Reviewed-by: Richard J. Moore <rich@kde.org>
* Fixes crash in gif image decoderEirik Aavitsland2015-03-131-0/+2
| | | | | | | | | Fuzzing test revealed that for certain malformed gif files, qgifhandler would segfault. Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 (cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6) Reviewed-by: Richard J. Moore <rich@kde.org>
* QGLWidget and re-parentingTimur Pocheptsov2015-03-021-1/+1
| | | | | | | | | | | | | | On OS X we have QWidgetPrivate::glWidgets list to track all child gl-widgets and this propagates though all the widget's tree, starting from QGLWidget and up to the top-level window ('isWindow'). It can happen, that some of widgets in a chain is becoming a window (but still has a parent) - this results in QGLWidget's destructor failing to remove 'this' from one of ancestors (since it stops on the first 'isWindow' ancestor). Modify QWidgetPrivate::setParent_sys that it does NOT add glWidgets into the parent's glWidgets, if this widget isWindow itself. Change-Id: I4bf4a927a4e43537355fdcdef465638c91e9f956 Task-number: QTBUG-20652 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Simplify mirroring code and add tests for non-aliged 1 bit imagesLaszlo Agocs2015-02-271-89/+109
| | | | | | | | Like it is done in Qt 5. Also add the autotest which was completely missing in Qt 4. Change-Id: Iaf89272b4e5b7f377c4b2f1ce929661f3d0edd9a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix Carbon buildAndy Shaw2015-02-271-1/+1
| | | | | Change-Id: Iae9445d1777ffced3d998e3f9a0a57117fa8d192 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Fix a division by zero when processing malformed BMP files.Richard J. Moore2015-02-261-0/+6
| | | | | | | | | | | This fixes a division by 0 when processing a maliciously crafted BMP file. No impact beyond DoS. Backport of 661f6bfd032dacc62841037732816a583640e187 Task-number: QTBUG-44547 Change-Id: I43f06e752b11cb50669101460902a82b885ae618 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix Focus problem with QX11EmbedWidgetYikei Lu2015-02-161-0/+3
| | | | | | | | | Since QX11EmbedWidget can be included in another Qt application which has QX11EmbedContainer, QX11EmbedWidget should be activated at first. Task-number: QTBUG-3617 Change-Id: I23e12f6c3ed9f7bd4a3ac0d0237bf7382db14ee2 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Don't leak RENDER Pictures in QPixmap::paintEngine().Pierre-Loup A. Griffais2015-02-131-3/+5
| | | | | | | | Qt 5 doesn't use serverside pixmaps, so doesn't need this patch. Change-Id: I5ad456679efd3706582dd1e6ca8e6b4404298739 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Backport implementation of OS X QSystemTrayIcon from Qt 5Samuel Gaist2015-02-121-62/+110
| | | | | | | | | | | | This patch aims to bring support of OS X >= 10.8 notification center and update the growl support code. [ChangeLog][OS X][Nofication] Added support for OS X 10.8 and upper notification center. Task-number: QTBUG-21830 Change-Id: Iad19c5e3a915e2caf15730a27ac762c9c11e493c Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Added check if fontEngine is still in the cache.David Weisgerber2015-01-291-1/+1
| | | | | | Task-number: QTBUG-22942 Change-Id: I9e4ac72168886769993cb19fac7a370c377ff3af Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix bugs generating PDF on CocoaJames Turner2015-01-292-3/+67
| | | | | | | | | | Provide real implementations of: properties(), faceId() and getUnscaledGlyph Task-number: QTBUG-10094 Change-Id: Ib84a7a5c9e29e4d634b47bc2856787b2482048da (cherry picked from qtbase/517fb9026896f7ac20376f253babae5a7c57721d) Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Bump year to 2015Kai Koehne2015-01-151-2/+2
| | | | | | | Bump year to 2015 in all but source code comments. Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix compilation with QDND_DEBUG.Friedemann Kleint2015-01-062-5/+7
| | | | | | Task-number: QTBUG-43466 Change-Id: I9a8ef1f33635469f12d259af9716eb60b650a9de Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Check world matrix is true when seeing if transformations are supportedAndy Shaw2015-01-021-0/+2
| | | | | | | | | | If the world matrix is turned off then if the raster paintengine should not support transformations for the text as otherwise it could end up being incorrectly transformed. Task-number: QTBUG-35200 Change-Id: I68fa6654ee87016986ba9d9469673fc8b9e0875e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* QIdentityProxyModel: remove slow bounds-checking, for more performanceDavid Faure2014-12-241-3/+0
| | | | | | | | | | | | | If we're called out of bounds, sourceModel()->index() will take care of returning an invalid model index anyway. So calling rowCount+columnCount every time index() is called can be avoided. These calls can be particularly slow when sitting on top of a stack of proxymodels. And index() itself is called very often, i.e. when a proxymodel on top of us is used by a delegate which calls data() for many different roles. Change-Id: I00dd5cf432c0591f41e6fa6fc86c845f29845cd1 (cherry picked from qtbase/3de0f442b5857915f26be6600bc8e54d1af08208) Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* 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>