summaryrefslogtreecommitdiff
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-021-2/+4
|\ | | | | | | Change-Id: Ibb1d26d59fb131e9fbdbcdd4a9009e96f0cb10a9
| * Fix build when filedialog feature is disabledv5.12.0-beta2v5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-10-011-2/+4
| | | | | | | | | | | | | | | | When the filedialog feature is disabled, we cannot include the headers for it, so we move the include into the #if block instead. Change-Id: I7b3556b570b8e7bd4aaed0ed8b1a0f4195b78975 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix feature dependenciesValentin Fokin2018-08-281-0/+9
|/ | | | | | | | | | | Add missing guards for header includes: 07490d56 Fix feature dependencies This also fixes build with -no-feature-action configuration. Change-Id: I2deb2dda19104bfa2c28f02617729f57da52c2d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ieb67edec480eba18cdad29f39b262cfb8839bf8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-13/+13
| | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Build fix for various widget featuresPaul Olav Tvete2017-03-031-0/+2
| | | | | | | | Make QtQuickControls build with -no-feature-spinbox, textedit, toolbar, itemviews, wheelevent, tabbar, tabwidget and slider. Change-Id: I780df0f624e885be03307908d4133d4ab91f8bea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix feature dependenciesPaul Olav Tvete2017-02-063-19/+54
| | | | | | | | | Build with -no-feature-filedialog, -no-feature-messagebox, -no-feature-colordialog, and -no-feature-fontdialog Change-Id: I0d63451a546014400f051645460a1fc1362eb753 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-1/+1
|\ | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-03-151-0/+8
| | | | | | | | | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0410-120/+150
| | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Replace foreach with range-based forAnton Kudryavtsev2016-01-161-1/+1
|/ | | | | Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesKai Koehne2015-11-191-1/+8
| | | | | | | Change-Id: Iae6420d4e0f0f1ef374cce4ab91101e3b04af6bf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Enable the build of Layouts with QT_NO_ACCESSIBILITYLiang Qi2015-09-151-0/+2
| | | | | | Change-Id: I8936d86f9cac5b0cc6231dc08fb986129c68f599 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devGabriel de Dietrich2015-07-221-1/+1
|\ | | | | | | Change-Id: I689c18ad192a38581d3058e2a555d6438a8d08e2
| * Use Q_DECL_OVERRIDE consistentlyThiago Macieira2015-07-191-1/+1
| | | | | | | | | | Change-Id: Ib306f8f647014b399b87ffff13f24277273a6f4f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Add QList::reserve() callSergio Martins2015-06-081-0/+1
|/ | | | | Change-Id: I6a061f06ba2ec1fbd0d27a642b4aa7be1dc18db9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Dialogs: override selectedUrls in QQPlatformfiledialogRichard Moe Gustavsen2015-03-182-0/+9
| | | | | | | | | | Rather than checking if a dialog helper is in use in QAbstractFileDialog, we override selectedUrls in QQuickPlatformFileDialog. Otherwise the version in QQuickFileDialog will be called first, which tries to return selectedUrls from the QML version (which might not be in use). Change-Id: If61647078ed2dd535384dcea67767bfc729edfe0 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: update license headersJ-P Nurmi2015-02-1110-160/+190
| | | | | | Change-Id: I1abdce308929507416b5f24b4442d0b978886a46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-084-4/+4
| | | | | Change-Id: I1eb87e2037ecf36b7d313d11bf3215fa70d26b59 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-2510-190/+110
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I470909ba0980db33ab551790d619c59a35978590 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Update plugins.qmltypes for QtQuick.PrivateWidgetsShawn Rutledge2014-04-171-56/+68
| | | | | | Change-Id: I53236f5698b2430e533d94ebb146beb72ce49c21 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Doc: Append handler names to \qmlsignal documentationSze Howe Koh2014-03-184-0/+16
| | | | | Change-Id: I5e06bdf03ba1ba8e5fe7669f690420dc9a039129 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* MessageDialog: press escape or titlebar close button to dismissShawn Rutledge2014-02-281-1/+23
| | | | | | | | | | | QMessageBox is a bit special compared to other dialogs, but we don't need it to be so special in QtQuick.Dialogs. Also on OSX, cmd-period will dismiss the dialog, regardless whether it is a QMessageBox or the QML implementation. Task-number: QTBUG-36227 Change-Id: I5dd43080600e9c3774990190bb401291efb8e742 Reviewed-by: Liang Qi <liang.qi@digia.com>
* changes to MessageDialog click(StandardButton, ButtonRole) signal/slotShawn Rutledge2014-02-271-2/+2
| | | | | | | | | | | | After f212322a6ecb237d5fb53e56c6dafffb87e45f09 there was a warning about failing to connect QMessageBoxHelper::clicked to this slot. Also accept() and reject() are not signals so they should not be called with emit. Task-number: QTBUG-36988 Change-Id: I1752ec08cbe82cc2bd9ffc9d920c1487bc17fa76 Reviewed-by: Berthold Krevert <berthold.krevert@basyskom.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Consolidate StandardButton, ButtonRole and related functionsShawn Rutledge2014-02-151-2/+2
| | | | | | | | | | Moving them into QPlatformDialogHelper for the convenience of both widgets and QtQuick.Dialogs. The main reason is to ensure that QtQuick.Dialogs does not need to depend on the widgets module, in order to re-implement the button box concept in a generic dialog. Change-Id: I471dff185767d05f3579c76082550008085ee681 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-044-17/+17
| | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I793aea0f46cc74f6466e52d00c0ec868c6603c77 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-0313-0/+1582
| | | | | | | | | | This will enable using Controls in the QML dialog implementations. For now, Controls are used only as drop-in replacements for the Button, Checkbox, and TextField which were custom implementations in the qtdeclarative module before. Change-Id: Ic79e9e8e5715a72ce51f4c724bfdfd33653300f2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge RangeModel into plugin to simplify deploymentJens Bache-Wiig2011-02-2120-876/+0
|
* More re-organization of desktopJens Bache-Wiig2011-02-2119-37/+37
|
* Added widgetsJens Bache-Wiig2011-02-2120-0/+876
View Lorry Controller Status