summaryrefslogtreecommitdiffstats
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
* QCommonStyle: use RSIP_OnMouseClick for SH_RequestSoftwareInputPanelRichard Moe Gustavsen2013-06-251-4/+0
| | | | | | | | | | Both Android and iOS needs the style to use RSIP_OnMouseClick (and qwindowscestyle and qwindowsmobilstyle as well, it seems) so set it as default (instead of expanding the #if test even more). Change-Id: I93a78e11031b506c2cb80f30f1946fe25f7945a9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-2410-45/+56
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2010-45/+56
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| | * hide placeholder text when QLineEdit has preedit textTasuku Suzuki2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ica84e9ce715702b690906ef748970e16d9162c4b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Aurélien Gâteau <agateau@kde.org>
| | * Doc: remove the duplicate for in QStyle documentationLiang Qi2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31739 Change-Id: I72ad52da7d7e6899148a91d22266e79dd3184d4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * fix auto-enabling of windows styleOswald Buddenhagen2013-06-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | it needs to come after the vista and xp style blocks. Change-Id: I66b5c1eff41b19a76802a77b6926552d7343b29c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * remove pointless positive QT_FOO_STYLE definesOswald Buddenhagen2013-06-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | they are not used. only the negative QT_NO_FOO_STYLE defines are used. Change-Id: Ic39081240c78cf66bd50c300b4aad04abca6f38c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * don't claim that mac style needs windows styleOswald Buddenhagen2013-06-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | we have commonstyle for that for a while now. Change-Id: I1ab3c86af994fc9cc7aaf65d28a2428b5e02be99 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * If a QWidget is ignored for auto-quit, ignore its corresponding QWindow.Stephen Kelly2013-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Unit test by Friedemann Kleint <Friedemann.Kleint@digia.com> Task-number: QTBUG-31569 Change-Id: I526d33d4f88a41f6ac349098476bc45af6c841b0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix QSpinBox clipping issue on Mac when frame=falseJens Bache-Wiig2013-06-191-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression from 5.0. Since we still require a minimum height to be present in order for the spin buttons to draw correctly, we require the same height from a spinbox without a frame as one with a frame. task-number: QTBUG-31538 Change-Id: I999f59a29e826e8e621faebffce9cccd9bedb8ca Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * QMacStyle: enable scroll style changes for non-QScrollBarsJ-P Nurmi2013-06-172-3/+17
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31537 Change-Id: Iee2148609df5cb2c121da4088bcd79f26c2eedc4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Remove use of 'register' from Qt.Stephen Kelly2013-06-174-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is deprecated and clang is starting to warn about it. Patch mostly generated by clang itself, with some careful grep and sed for the platform-specific parts. Change-Id: I8058e6db0f1b41b33a9e8f17a712739159982450 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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: I323d7ba206352a5d533584543b9a2ebf842b4dfc Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | | Show QTextEdit placeholder even when focusedBenjamin Port2013-06-211-8/+3
| | | | | | | | | | | | | | | | | | | | | Useful to have the same behavior in QLineEdit and QTextEdit. Change-Id: I02d6ac0a6072403c7aa3e8f76a728c46a9d66b14 Reviewed-by: David Faure (KDE) <faure@kde.org>
* | | QDialogButtonBox: add a missing constructorMarc Mutz2013-06-212-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the buttons in the constructor is a use-case that happens more often than setting the orientation. Yet, there was a (Qt::Orientation,QWidget*) constructor, but no (StandardButtons,QWidget*) one. This patch adds it. Change-Id: If6a5c9f7450a388cd77bd93c8dd144b2fdc11847 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | | QTreeWidget - iterator fix in QTreeModel::ensureSortedThorbjørn Martsum2013-06-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can not trust the iterator when we do erase. This patch makes an index while we do a takeAt and then we restore the iterator from that index. This both ensures that we can merge an iterator check and ensures consistent behavior. Change-Id: Icbe67051cb055d24541475e826109212eba9dd30 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | GTK-style - fix non-standard usage of QHash-iteratorThorbjørn Martsum2013-06-211-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Even if it currently works it is highly non standard to modify (incl. free/delete) the key for the iterator and then use it afterwards. The current code prevents a merge of a patch that uses the key to check if the iterator is valid. Change-Id: Ia89553ea4ba53e24488a6bfe06b8d7d0e351c1ea Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-123-7/+9
|\| | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| * QDockWidget: Keep position when undocking.Friedemann Kleint2013-06-121-0/+3
| | | | | | | | | | | | | | | | Initialize undockedGeometry to roughly the current position. Task-number: QTBUG-31044 Change-Id: I03cbe280d1215bb58ab721b60e29b45359cde76d Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * The SingleClickActivation setting was wired to the wrong platform settingRobert Griebl2013-06-101-1/+1
| | | | | | | | | | Change-Id: I24dacd6d6cbc22eaf29dc09a6f59bf4ee7d48f37 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-101-6/+5
| |\ | | | | | | | | | Change-Id: I89c251999ae2a82522b40471fd13f2e06b00ece8
| | * Doc: Fixed typo in QDialog.Jerome Pasion2013-06-071-6/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31493 Change-Id: I7bb7b249a0336dd949f8c74bcc22c0b7c39d0885 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | | Fix setPlaceholderText in QLineEditBenjamin Port2013-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't use focus to show/hide place holder text, we don't need to check widget focus but if text is empty. Change-Id: I37f2fdb9e20a64ca38c61e60190f95635695c613 Reviewed-by: Aurélien Gâteau <agateau@kde.org> Reviewed-by: David Faure (KDE) <faure@kde.org>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-047-36/+11
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-313-31/+6
| |\| | | | | | | | | | Change-Id: I0a8fe79a80b7720f76e3c0b03cc2c9a769d4009b
| | * Mac style: Remove yet another reference to widgetsGabriel de Dietrich2013-05-301-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I545cfe22c6307864cdb18093a37e09a8ad042347 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * QMenu: Remove last references to QMacWindowFaderGabriel de Dietrich2013-05-302-29/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was never ported to Qt 5, and 10.7 has simple API for that. Task-number: QTBUG-31336 Change-Id: Ie00c4ed3af9cd098c9e63eba1c654f1801aa83aa Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Refer to setDragEnabled in QLineEdit's detailed description.Mitch Curtis2013-05-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's currently not obvious how to drag text from a QLineEdit. Task-number: QTBUG-22413 Change-Id: I5b92ce5c7425a1cb8ee6f401c685424eb9396592 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Fix incorrect statement in QTreeWidgetItem docs.Mitch Curtis2013-05-301-2/+2
| |/ | | | | | | | | | | | | | | Task-number: QTBUG-25598 Change-Id: Ib90578081d4e52877ce4842ebbc824ef74179341 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Made sure items with preferred width of 0 could also stretchJan Arve Saether2013-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no stretch factors were specified, we used the preferred size as a stretch factor. Obviously, that didn't work if the preferred size was actually 0. This patch works around this by actually setting the stretch factor to 1.0 if this is the case. This should work fine in most cases, except for the case where there are also other items with a preferred size close to 0. In this case, the item with preferred size 0 will just grow faster than an item with e.g. preferred size 0.1. Task-number: QTBUG-31217 Change-Id: I966455da0bdd00308591c7f7cfbc4e134d423e57 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Doc: Removed pages from "technology-apis" group.Jerome Pasion2013-05-271-1/+0
| | | | | | | | | | | | | | | | "technology-apis" doesn't serve a purpose anymore and its product function is replaced by the new overviews on the landing page. Change-Id: I1e959981fd163966a54bec0d697bed12007c39e6 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Added a placeholderText property to QTextEdit.Benjamin Port2013-05-283-0/+47
| | | | | | | | | | | | | | | | This commit adds a placeholder text for text edit. If text edit doesn't have focus and the document() is empty, this placeholder will be shown. Change-Id: I8b51f1a246452b63d6390e94853cf2864a7ff05f Reviewed-by: David Faure (KDE) <faure@kde.org>
* | QToolTip - add static showText with time.Thorbjørn Martsum2013-05-272-11/+27
| | | | | | | | | | | | | | | | | | | | It is nice to be able to control how long time a tooltip is shown. This is the first part of solving: Task-number: QTBUG-1016 Change-Id: I8e313df8a2acdc5ccc91d9c8ce956c30c76daf4b Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Add QComboBox::currentDataGiuseppe D'Angelo2013-05-272-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convenience function that returns user data for the current item, analogous to currentText(). This avoids to having to write the cumbersome QVariant variant = comboBox->itemData(comboBox->currentIndex()); (It's quite common to put strings as text and the corresponding enum values as user data.) Change-Id: I8c7632c647c5583d18e4e22703aeb4447d73162d Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Add web color QLineEdit to QColorDialog.David Gil2013-05-271-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | This web color QLineEdit shows the hex number of the selected color. Besides, it can be edited and accepts 3 and 6 digit hex numbers. Change-Id: Idf629fbdc203fc099d446b31cbb49f2ff56be810 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2328-97/+181
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
| * Fix the Mac build on 32bit with c++11Jocelyn Turcotte2013-05-231-8/+8
| | | | | | | | | | | | | | | | CGFloat is a float on 32bit and qreal is a double. This causes a narrowing error when building with c++11 support. Change-Id: Ia73378ff9798d1f547b37f97393564e2c9e3672d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * QFusionStyle: fix highlight colorsJ-P Nurmi2013-05-231-2/+2
| | | | | | | | | | | | | | | | | | Respect the current color group of the palette, and fix the inactive highlight color. Task-number: QTBUG-30034 Change-Id: Iddfc15a2dd98d4588c6c587b7aaf64d88538fa28 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Do not call g_type_init() with GLib >= 2.36Dmitry Shachnev2013-05-221-0/+4
| | | | | | | | | | | | | | | | g_type_init() is deprecated and the type system is now initialized automatically. Change-Id: I5bf5702136cc948dea0a55676dfee2486f12ca00 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Fixed crash associated with reparenting a QGLWidgetSamuel Rødal2013-05-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure that we don't reset() the context when the QGLWidget is being reparented, as that will lead to the QOpenGLContext being destroyed and not recreated, leading to a crash in makeCurrent(). Also, don't destroy() the widget if it has not yet been created, as in that case there's no ParentAboutToChange event sent. Task-number: QTBUG-31016 Change-Id: I409fff94456802a80bd72b470a6fbaee87505baa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * apply standard behaviorMaurice Kalinowski2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | According to documentation hoverLeaveEvent calls update(), which happens in QGraphicsItem. As QGraphicsWidget has not been calling parent implementation that did not happen and e.g. animatedtiles example did not work correctly. Change-Id: Ia25dda967bd21298c763996589c63dc173ba6b6a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * Check that files we expect to find actually exist when using a cmake package.Stephen Kelly2013-05-201-3/+6
| | | | | | | | | | | | Change-Id: If7c724daa85df5e29e410b8deb4e69beb43ee8ea Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Only call QA::updateAccessibility() if the "control owner" is a QWidgetJan Arve Saether2013-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItems are not accessible, and calling updateAccessibility() with a QGraphicsTextItem caused the accessibility framework to try to load a plugin for QGraphicsTextItem. Since that was not found, it dumped this on the console: "Cannot create accessible interface for object: QGraphicsTextItem" Task-number: QTBUG-29720 Change-Id: I4aaa08ee6e97f03617fa08da0c6ef35992efdebf Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * QtWidgets: avoid integer divide by zero in QProgressDialogLiang Qi2013-05-151-0/+1
| | | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-31046 Change-Id: Ie549b59112f458de478294fa00443a3cf6898c85 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Don't send the same Input event twice to QGraphicsProxyWidget::inputMethodEventGatis Paeglis2013-05-151-1/+3
| | | | | | | | | | | | Task-number: QTBUG-30705 Change-Id: I6fa02807255d0abf74aa38e94662bbe3d9e642bb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Don't draw size grip on Mac > 10.6Jens Bache-Wiig2013-05-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | After Apple added the resize functionality to window borders, they stopped rendering the size grip in most apps. Hence we do not need to either. Since the status bar height depends on the status bar being there, we considered the safest option to keep it but make it hidden. Change-Id: Ida06e8f0de0f50d746a7d25bc5a472e22a370645 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Respect specified minimum height for menuBar also if it has HFW.Jan Arve Saether2013-05-141-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 Change-Id: I3c1bb8063c92d6eda7e9433e44f08967d8e1c43e Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * QGV: fix items not to be selected on right mouse button releaseJ-P Nurmi2013-05-141-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-30990 Change-Id: I421d9169b592da2b468eceb9df4f3f7c6a06e8d6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * Doc: Replaced the HTTPS links with HTTPVenu2013-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | The HTTPS links fail in Qt Assistant on Windows as the qt installation package includes qt libraries that are built without SSL support for legal reasons. Task-number: QTBUG-31073 Change-Id: I86909abadb1e8164749d924cc53ee05aa57f8f31 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * QWidgetWindow: Prioritize keyboard grabber over popup for key events.Friedemann Kleint2013-05-131-4/+2
| | | | | | | | | | | | | | | | | | | | Fix the inline editor of the QMenuBar in Qt Designer not working due to the key events being sent to the QMenu which is open at that time. Task-number: QTBUG-31059 Change-Id: Ic96bc119d0d2566d8f8d6ee62858445a70a447b7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 20:44:50 +0000