summaryrefslogtreecommitdiffstats
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
* QItemDelegate: let QTextEdit and QPlainTextEdit receive tab keypressesGiuseppe D'Angelo2015-01-041-5/+28
| | | | | | | | | | | | | | | We already let enter/return key presses to reach text edits instead of closing the editor. Do the same for tab/backtabs. [ChangeLog][QtWidgets][Important behavior changes] QItemDelegate will now not close a QTextEdit/QPlainTextEdit editor when the tab key is pressed; instead, the key will reach the editor. Task-number: QTBUG-3305 Change-Id: Ife9e6fdc5678535c596d1068770b0963134d8d5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-296-14/+37
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
| * Doc: Describe the enum item QStyle::PE_FrameStatusBar as obsoleteAlexander Volkov2014-12-221-1/+1
| | | | | | | | | | Change-Id: Ibda864d2b037bd8b2484b8642423ae1bca218021 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * QColorDialog: Fix a few layouting issues.Sérgio Martins2014-12-221-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fixes combo-boxes being too big and some alignment issues that were not present in Qt4. See screenshot in JIRA task. Tested with QT_SMALL_COLORDIALOG too. Task-number: QTBUG-43501 Change-Id: I2aefb64be1c5f3c4894149d85e1a12c9c0cc3d62 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * QScrollBar: emit valueChanged once even if a slot takes too much timePavel Krebs2014-12-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Put also processing of control activation into initial timer check for possibly pending mouse release event. [ChangeLog][QtWidgets][QScrollBar] Fixed a bug where the valueChanged() signal was emitted twice if a connected slot took too much time. Task-number: QTBUG-42871 Change-Id: I7bad5279ef84463a033b55256d241d4445374081 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Don't clear lineedit in non normal echo mode when validation is invalidAndy Shaw2014-12-192-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced with c09e9f71173a698670d6c728291ee24f53d50800 which caused the lineedit to clear the whole text when an invalid character was entered into a lineedit with an echo mode that was not Normal and a validator was set. Now if undo() is called directly then it will still clear the text as it is considered to be called as a user. Whereas the validation will take care of the invalid entry by using internalUndo() as before which avoids the clearing of the entire text. Task-number: QTBUG-29318 Change-Id: I5ff5777a75ab864de2217441b5f518f50646bd8f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * doc: Fix mistake in QProgressBar::orientationAlejandro Exojo2014-12-191-1/+1
| | | | | | | | | | | | | | | | Reported on qt-interest: should say "true" instead of "false". Change-Id: Ic9d2608631679896179ae8601790847163a9224c Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | QSizePolicy: add Q_FLAGS(ControlTypes)Marc Mutz2014-12-261-0/+1
| | | | | | | | | | | | | | | | | | | | There's no reason not to have it, and it allows better debug output. [ChangeLog][QtWidgets][QSizePolicy] QSizePolicy::ControlTypes is now introspectable through QSizePolicy's meta object. Change-Id: Ia274c708f31e735e4605bd4769aa65a9b78d690f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QWidget: use a static assert for a compile-time checkGiuseppe D'Angelo2014-12-251-3/+3
| | | | | | | | | | | | Change-Id: I48ec9afc7e5b01e833f66b7e893237d3c68ad048 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | QColorDialog: Move string into retranslateStrings()Sérgio Martins2014-12-231-1/+2
| | | | | | | | | | Change-Id: I802b3e3463f77777cb0f25b60fc069da32d1c467 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | QColorDialog: Add missing accelerator keySérgio Martins2014-12-221-1/+1
| | | | | | | | | | Change-Id: Ibafe9f1bf36a8c19fb7f3f66e425db2e7d9f84ca Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Fix discard framebuffer support in QOpenGLWidgetLaszlo Agocs2014-12-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | The enum values are different for the default framebuffer and non-default ones. With QOpenGLWidget there is always a non-default fb bound, so the correct way is to use GL_COLOR_ATTACHMENT0 etc. GL_COLOR_EXT and friends are only allowed when the default framebuffer is bound, as per spec. Change-Id: Ia8c27038dc899e44d1a95eb88adbc1cac72652b0 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | Remove Q_NO_USING_KEYWORDThiago Macieira2014-12-2030-222/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a lot of code now requiring it. Any compiler that doesn't support the keyword is too old for Qt now. The last time anyone asked about this macro was for QTBUG-27393 and we don't know which compiler that was. As a necessity, this patch contains a reversal of a0c3a57aed5cde37017733e7cf5e41cc6a1174aa [ChangeLog][Compiler Specific Changes] Qt 5.5 now unconditionally uses the "using" keyword. Compilers that do not support this keyword are deprecated and will not be able to build Qt. Previous versions of Qt may or may not compile, as no testing was done to ensure it worked. Change-Id: Ief042f34aba555a095d1f342a0ee7ee9feadf42d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Make setting twice the very same model on QComboBox a no-opGiuseppe D'Angelo2014-12-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Basically, introduce a small check for this corner-case situation. Setting a model doesn't just store a pointer, but also resets the current index, changes the line edit completion model, and so on, and seems silly to trigger changes in such cases. [ChangeLog][QtWidgets][QComboBox] A QComboBox does not reset itself any more when setting the same model more than once. Change-Id: If028b36cdfaa5552c156dd900e123ca9a04d4e3d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-1811-46/+68
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d
| * Fix OS X style MDI area subwindow resizeMarko Kangas2014-12-181-0/+4
| | | | | | | | | | | | | | | | Fixed regression bug of the commit #fc11798 Change-Id: I3d64fd67dfe2196a726886a19b9510dd12ff255d Task-number: QTBUG-43392 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * Prevent continuous painting with viewport QOpenGLWidgetLaszlo Agocs2014-12-181-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the source widget to the texture list (may be null for custom compositor implementations that add textures not belonging to actual widgets). This allows us to do proper checks with the dirtyRenderToTextureWidgets list. As a result paint events are only sent to a QOpenGLWidget if (1) there was an update() for it or (2) it was actually marked dirty. (2) was previously behaving differently: the widget got a paint event when anything in the window has changed. This is fine for naive animating OpenGL code but less ideal for QGraphicsView. Bool properties like stacksOnTop are now stored in a flags value to prevent future explosion of texture list fields and parameters. Task-number: QTBUG-43178 Change-Id: I48cbcf93df72ac682c9b5d64982a8b648fe21ef3 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * QColorDialog: Fix matching against predefined colors.Sérgio Martins2014-12-161-4/+4
| | | | | | | | | | | | | | | | | | The grids are filled top to bottom, left to right, so use division to get the column. Task-number: QTBUG-43371 Change-Id: I02ad518512858ed71e0e3a0cae8c4e02d537a9b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * QColorDialog: Fix picking screen colors inside QColorPickerSérgio Martins2014-12-131-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you click "Pick screen color" and move mouse over QColorPicker (the square with gradients) unexpected things will happen: black will be picked half the times. This is because QColorPicker's black cross is painted under our mouse cursor. Although "pick screen color"'s use case is to pick colors in other windows, there's no reason to not make it work on QColorDialog itself too. Task-number: QTBUG-43288 Change-Id: I03ca02148cc15ad41d545723d4ac4f5a82842b4b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Propagate the source of mouse eventsAlexander Volkov2014-12-114-2/+16
| | | | | | | | | | | | | | | | | | Set the source for mouse events which were caused by other mouse events. Change-Id: Ifca1648883ef2b94bb317ed9340759475d350146 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Enable input methods for QQuickWidgetPaul Olav Tvete2014-12-102-0/+8
| | | | | | | | | | | | | | | | | | | | Make it possible for widgets to have non-widget focus objects. Since we cannot add new virtual functions due to binary compatibility, we have to do it in QWidgetPrivate. Task-number: QTBUG-42677 Change-Id: I5f74daed2793c1c149bbe02e54ff2f7e2ad1af9e Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * Fixed small bug in code snippet for QGraphicsItemBenjamin Summerton2014-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | If the enumeration "Type" isn't declared in the public scope, it will cause an issue upon compilation. Previously, it was ambiguous on which access level this should be in. Snippet [18] though has the enumeration in the correct access level. Change-Id: If699df80def3e1b09d8d82df74c4ca85eba003d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Removed redundancy in QGraphicsItem documentation.Benjamin Summerton2014-12-102-16/+1
| | | | | | | | | | | | | | | | Snippets [1] and [QGraphicsItem type] are the exact same, each referenced once, and only in the same file. Removed the later snippet. Change-Id: I4f35a8322034b00e9b5f5d6c6d96e652f11f8384 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QHeaderView: check that length is correct during restoreState.Arnaud Bienner2014-12-171-23/+52
| | | | | | | | | | | | | | | | | | | | Length is supposed to be equal to the section items length, but the state saved might be corrupted. If so, print a warning, return false and don't restore this corrupted state. Change-Id: I4d3dfec528a65fc81ed70d1c8cc69c11faf414e0 Task-number: QTBUG-40462 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | Add QFont::Weight enum valuesPierre Rossi2014-12-121-11/+3
| | | | | | | | | | | | | | | | | | | | And try to make good use of them in order to match the QFont request more closely. Task-number: QTBUG-38482 Change-Id: I768dfa8828e370d77a1c17ecf4796d750b3edd9b Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Add NoPartialUpdate support to QOpenGLWidgetJørgen Lind2014-12-112-5/+101
| | | | | | | | | | | | | | | | | | | | [ChangeLog][QtWidgets][QOpenGLWidget] Added an UpdateBehavior flag to QOpenGLWidget and enabled support for NoParitalUpdate for QOpenGLWidget. NoPartialUpdate is the default update behavior for QOpenGLWidget. Task-number: QTBUG-40717 Change-Id: I47d11460e4ef899a24cfd4964ddcac57bc3f91ff Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Make the defaultSectionSize property of QHeaderView style dependentAlexander Volkov2014-12-116-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new enum items PM_HeaderDefaultSectionSizeHorizontal and PM_HeaderDefaultSectionSizeVertical to QStyle and get corresponding values in QHeaderView. This way we get rid of some magic constants in QHeaderView and we can have reasonable values for the default section size for high-DPI displays. [ChangeLog][QtWidgets][QHeaderView] Default section size is now style-dependent by default. [ChangeLog][QtWidgets][QHeaderView] Added resetDefaultSectionSize(). Change-Id: I44e152c5cf0bec1e5d78e1e62f47a2d1f761dfbf Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | Use categorized logging for QGestureManager.Friedemann Kleint2014-12-111-29/+24
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-40461 Task-number: QTBUG-15768 Task-number: QTBUG-38925 Change-Id: I4b422b2b041a44ee8c24683ab2947cccfe422126 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-1018-80/+77
|\| | | | | | | | | | | | | | | Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
| * Android: Make cursor keys work againPaul Olav Tvete2014-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On Android, we disable mouse selection, since that does not work well with touch screens. In change a03a69efb9ed89cd4a90878eda20, we accidentally disabled keyboard selection as well. Unfortunately, disabling keyboard selection will disable all keyboard movement. This change re-enables TextSelectableByKeyboard. Task-number: QTBUG-42991 Change-Id: Ie63ed3d88a0abcb72f04e0ec60a5b91c0b14a47e Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Support vertical sliders on AndroidPaul Olav Tvete2014-12-091-6/+26
| | | | | | | | | | | | | | | | | | | | There is no such thing as a vertical slider in the native Android style. Therefore, we need to rotate the painter in order to draw one. Task-number: QTBUG-41992 Change-Id: Ibe2bf1d7fa27756aad0b8469c8752d6d3e848527 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * QHeaderView: take the sort indicator into account when eliding textGiuseppe D'Angelo2014-12-092-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | By adding PM_HeaderMarkSize to the margins if the section is showing a sort indicator. Turns out that that particular enum was actually unused in QtWidgets (!), so tune the value to match reality. Task-number: QTBUG-629 Change-Id: I8bc70451656d634a064c8b5014e449977c55aa9d Reviewed-by: Cristian Oneț <onet.cristian@gmail.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Styles: improve SH_Header_ArrowAlignment handlingGiuseppe D'Angelo2014-12-093-2/+9
| | | | | | | | | | | | | | | | | | | | | | The docs were wrong, and the returned values from some styles did not match reality, so fix that. Again, this style hint was not used at all within QWidgets... Task-number: QTBUG-629 Change-Id: Ie6ff80fd09bc3292ba3d787ccca4d6f4c0056e89 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
| * Widgets: be more careful when setting focus on touch releaseRichard Moe Gustavsen2014-12-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An application might choose to change focus when receiving mouse/touch press/move events. This is in conflict with Qt assigning focus on touch release (QPlatformIntegration::SetFocusOnTouchRelease), since Qt might then reassign focus to something else. An example of this is seen with the "frozencolumn" example. Here, when the user double clicks on a cell, the application creates an 'edit' widget inside the cell that gets focus. But at soon as the last release is sent, Qt will change focus to the focus proxy of QScrollArea instead. This patch will introduce an exception to setting focus on release, so that we only set focus if we detect that focus didn't change (by the app) while processing press/move events. Task-number: QTBUG-39390 Change-Id: I7b398b59e3175265afd2fcd938e11f88155abc89 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * Update window flags from QToolBarPrivate::endDrag().Friedemann Kleint2014-12-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | Activate previously #ifdef'ed code which cleared the Qt::X11BypassWindowManager hint. With the hint set, the tool bar stays on top and does not get deactivated along with the application by the WM. Task-number: QTBUG-41189 Change-Id: I6f3f334860e46dd4867f5942f15e5a090340f2d7 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * QMacStyle: Fix 32-bit buildGabriel de Dietrich2014-12-051-1/+1
| | | | | | | | | | | | | | | | Again one of those CGRect vs. NSRect issues. Change-Id: Ia933cd6f002585e21247d2f9f85d2451db6dbaa0 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
| * QColumnView: don't set an invalid index as the current oneGiuseppe D'Angelo2014-12-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When any item in a QColumnView gets selected, the next column gets normally set to show the children of that index. When we are on a leaf of a tree model, the next column will have an invalid root index, yet we set that root index as the "current index" for the current column. Due to the special handling for invalid indexes in QAbstractItemView::setCurrentIndex, this ends up breaking the current item AND the current selection in that column. Further clicks inside the column for instance trigger the entire column (up to the clicked index) to get selected, because of that broken first setCurrentIndex. The simple fix is to stop doing that when the next column has an invalid root index. Task-number: QTBUG-2329 Change-Id: Icd10c0b958e25cd868536e1315561787977b68bd Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * QDockWidget: Prevent repetitive unplugging of floating dock widgets.Friedemann Kleint2014-12-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling QDockWidget::setTitleBarWidget() from within signal QDockWidget::topLevelChanged(), a nested call of QDockWidgetPrivate::setWindowState(unplug=true) is triggered, leaving it with Qt::X11BypassWindowManagerHint set and thus invisible/off screen. Force the unplug parameter to false if the widget is already in floating state. Task-number: QTBUG-42818 Task-number: QTBUG-38964 Change-Id: I6aff61e4ee1501f5db281566b66db66c19351410 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * Revert "Use single finger pan to scroll text edits on touch screens."Tor Arne Vestbø2014-12-041-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ffa46054d13c639cf9f7846a74ad3ebd07b9f5c. It completely broke text selection in text edits on iOS, and wasn't even tested on that platform before landing. It's also changing behavior in a patch release for multiple platforms, from being able to both scroll and select text, to only being able to scroll, which would be considered a feature-regression and an automatic -2 on the original patch. This means QTBUG-40461, a P2 regression from Qt 4 on Windows, will have to be re-opened, so that we can fix it properly. Task-number: QTBUG-43101 Change-Id: I26a2bafb4500b1ff4dc3fb942f197d11038b630b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Revert "QWidgetTextControl: Suppress drag selection for OS-synthesized mouse ↵Tor Arne Vestbø2014-12-043-35/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | events." This reverts commit cf0d96f4c8584a7eb9eeca304932f6ea88894b27. It broke text selection on iOS and was never tested on that platform. Task-number: QTBUG-43101 Change-Id: I9f224a3838a1f741bc9a9c24f16923ef2018ddf3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * QMenuBar: fix extra indent on the right with a TopLeftCorner widget.Friedemann Kleint2014-12-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | When setting a left corner widget on a QMenuBar, the first action rectangle is offset by its width and thus the width should not be added to the size hint. Use QSize::expandedTo() instead. Task-number: QTBUG-36010 Change-Id: I660e3facbd0aeb5fb84fac8923db3e0c7998309d Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * Respect the size hint signal for the column and row delegatesAndy Shaw2014-12-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The sizeHintChanged() signal from the column and row delegates need to be connected to the doItemsLayout() slot so that the view is updated when the size hint changes. Additionally doDelayedItemsLayout() is called to ensure that this is up-to-date as the size hints may have changed when the new delegate was set on the row or column. Change-Id: I458293f05ce9ef40a03bdbcab1a6e7a10f648c89 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Kevin Puetz <PuetzKevinA@JohnDeere.com>
| * QLayout: Observe contents margin when positioning the menu bar.Friedemann Kleint2014-12-021-1/+2
| | | | | | | | | | | | Task-number: QTBUG-38152 Change-Id: I53ea6bce33057251265a7eca1651aeabca314ba9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * QMainWindow: Observe left contents margin when positioning status bar.Friedemann Kleint2014-12-021-1/+1
| | | | | | | | | | | | Task-number: QTBUG-38152 Change-Id: I4c762a113dbfe47472d1087aa34c0e327083ee16 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-271-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.4.0 7231e1fbe24102f2a93b34dfa70e3dca884440d2 went into 5.4 instead of the 5.4.0 branch, thus the conflict. Change-Id: I70b8597ab52506490dcaf700427183950d42cbd1
| | * iOS, QComboBox: don't apply special case for OS X on iOSRichard Moe Gustavsen2014-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The special-case that was added for OS X before the iOS port came to be stops the virtual keyboard from working correctly. Task-number: QTBUG-41613 Change-Id: I0b8c83e98584389ea4a8aada16a1ee1a64300400 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | xcb: Fix transparent tray backgrounds with 24bpp tray visualsUli Schlachter2014-12-091-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0eefa785a0d8 ported Qt4's method of indirectly drawing the tray icon's background to Qt5. This commit makes it work a bit better. When drawing the tray's background, we use a ClearArea request to make the X11 server fill the tray icon with its background. Then we grab that background from the server and paint the icon on top of it. So this is pretty much pseudo-transparency at work. One small ingredient that was missing before is the BackgroundPixmap of the tray icon. If this attribute is set to ParentRelative, then our tray icon inherits the background of its parent window. That way the ClearArea will actually produce the expected background. Task-number: QTBUG-35832 Change-Id: I63fc4609064d8f858ca9e5cc290409a298b918b7 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Harmonize QPA TrayIcon showMessage parameter orderShawn Rutledge2014-12-084-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameters were misnamed in some places but still managed to pass them through in the right order. Rename to avoid confusion, and keep the parameter order the same as in QSystemTrayIcon::showMessage. Change-Id: Ib4c8fff15eff15034c4ea64757803b118e487144 Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | | QAbstractScrollArea: add a getter for the marginsGiuseppe D'Angelo2014-12-032-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strange API asymmetry that needed to be fixed. Task-number: QTBUG-8315 [ChangeLog][QtWidgets][QAbstractScrollArea] A getter for the viewport margins has been added. Change-Id: Ie1460b572206922031fc4effc2aa8261e25088b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add Q_DECL_OVERRIDE in the src subdirectoryOlivier Goffart2014-12-03169-1464/+1464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 02:22:32 +0000