summaryrefslogtreecommitdiffstats
path: root/src/dialogs/plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Android: use the correct path to DefaultWindowDecoration.qmlAssam Boudjelthia2020-08-111-1/+1
| | | | | | | | | | | | | Regression caused by 7a806347167607172ee38c60d30808b298224a8b. The file DefaultWindowDecoration.qml is installed under "qml/QtQuick/Dialogs/qml/" but the path used assumes it's under "qml/QtQuick/Dialogs/". Fixes: QTBUG-85434 Pick-to: 5.15 Change-Id: I536e3d805896815ae63c43c25b60c0e810dc3cab Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-281-4/+4
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I56268bc09fe861effc514acb4033bf8873873ab0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add missing overrideAlexander Volkov2020-05-251-1/+1
| | | | | | Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Combine repeated logic to get Dialogs QML files into one functionv5.15.0-beta1Assam Boudjelthia2020-02-171-46/+20
| | | | | | | Add fileLocation() function to return the path of each dialog type. Change-Id: I7213e8cd09f61eca000f481b1cae58e9e5b3405e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: Look in the correct location for the supporting QML filesAndy Shaw2020-01-151-4/+21
| | | | | Change-Id: I99db8554f88d39a2e9376b50bb1a6f8a334cf461 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Create the decoration component when it is neededAndy Shaw2019-04-161-8/+2
| | | | | | | | | | | | | | If multiple QQmlEngines are created and use a Dialog, initalizeEngine will be called more than once and therefore recreates the QQuickAbstractDialog::m_decorationComponent without deleting the original. Therefore we keep the decoration component url instead, and create the decoration component on demand. This ensures that it keeps the component relevant for the QQmlEngine and stops the memory leak from before as well. Fixes: QTBUG-75149 Change-Id: Ic79103f42d092d39b46868a45b4099ddc6edf9db Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
* Do not treat winrt as touch based mobile platformv5.11.0-beta4Oliver Wolff2018-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | While winrt used to be a touch based, mobile platform before, focus has shifted. Widgets were supported from the start and while they are not the main area of focus, disallowing widget dialogs is not the right approach here. Furthermore the current logic of whether widget dialogs should be registered does not work on winrt. The parts containing widgets either have to be removed completely or bound to the same specific conditions everywhere. The mix of setting "no_desktop" and not having widget dialogs unconditionally for "mobile platforms", but then doing additional checks when registering widget dialog types breaks the concept at least for winrt. Task-number: QTBUG-67144 Change-Id: I36fc5b6f8729bbd128faf1de95fc0bba297ab0e9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Don't conflict with Qt Quick Controls 2 when using the platform dialogsAndy Shaw2018-03-121-4/+4
| | | | | | Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add support for the defaultSuffix property in FileDialogAndy Shaw2017-09-171-2/+3
| | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-031-2/+0
| | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename QQuickDialog to QQuickDialog1v5.8.0-beta1Jake Petroules2016-10-061-1/+1
| | | | | | | | | | | | This fixes a linking error when Qt is built statically and both Qt Quick Controls 1 and Qt Quick Controls 2 are used in the same application, due to Qt Quick Controls 2 also containing a class named QQuickDialog. Change-Id: I16ad8b1a3c75d0fa3e4ba1c3ab54a63caf05bbea Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Leutgöb <alex@v-play.net> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@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>
* | Fix unused variable warnings in static buildsMitch Curtis2016-03-181-0/+2
| | | | | | | | | | | | | | The warnings are a result of b4c13916ec0fd7796acdf0ec5a1db0134479b3f2. Change-Id: I0b6a22d0fb3b7258ebfa905015f13d0474ac5b09 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-03-151-6/+28
| | | | | | | | | | | | | | 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-041-12/+15
| | | | | | | | | | | | | | 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/+2
|/ | | | | Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Pass non-trivially-copyable or large types by const-refSergio Martins2015-07-221-3/+3
| | | | | | | Change-Id: I38af4720b916731451cb28aee0d16eed097d3350 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Add support for compiling QtQuick Dialogs ahead of timeCaroline Chao2015-05-041-0/+2
| | | | | | | Don't try to load .qml files from the disk Change-Id: Ib2ff82789dbae68f0821bdd1e0697fb2267539d0 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: implement QML backup support for native file dialogRichard Moe Gustavsen2015-03-181-1/+4
| | | | | | | | | | | | | | | | | | | | QtQuickAbstractDialog will fall back to use QML version of a dialog if a dialog helper returns false on show. We will utilize this for file dialogs by letting a platform be selective about when to show a native dialog. A platform can use this to e.g show specific native dialogs for certain dialog configurations, and otherwise return false to signal that the caller should fall back to use the QML/widgets version. This patch will change the class structure to the following: QQAbstractDialog <- QQAbstractFileDialog <- QQFileDialog <- QQPlatformFileDialog and then register QQPlatformFileDialog as the abstract dialog that DefaultFileDialog.qml intantiates. This means that a file dialog will have QML contents ready for backup if the platform file dialog fails. Change-Id: I65d0fb9c49c501501e441873d6b858475fef5522 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: split registerWidgetOrQmlImplementation into three functionsRichard Moe Gustavsen2015-03-181-15/+31
| | | | | | | | Do this as preparation for a later patch to let the file dialog register a QML version, even when a native version is available. Change-Id: If207c73bf149f3bcb4f1b82c68677fea4e46cef7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: update license headersJ-P Nurmi2015-02-111-16/+19
| | | | | | Change-Id: I1abdce308929507416b5f24b4442d0b978886a46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: added qt.quick.dialogs.registration logging categoryShawn Rutledge2014-11-211-23/+9
| | | | | | | It's easier to turn on debugging instead of uncommenting #define. Change-Id: Ia1d39934c6dd30dd9fe850d109debfdda7a740da Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Dialogs: don't use widgets on mobile touch-based platformsShawn Rutledge2014-10-281-2/+14
| | | | | | | | It doesn't make sense to use widget-based dialogs in a QtQuick app on a mobile platform because widgets are not optimized for touch. Change-Id: I8659f247eb6e75ca827e8b42a0fb1e7f65dceee1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-08-251-19/+11
| | | | | | | | | - 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>
* QtQuick.Dialogs: check for inheriting from QApplicationShawn Rutledge2014-07-281-1/+1
| | | | | | | | | | Widget-based dialogs are allowed if the application is a QApplication, but subclassing is OK too. (cherry-picked from qtdeclarative 76952046ceccf2cd176a3452bc908cac769f90d9) Task-number: QTBUG-35769 Change-Id: I0b74c870488c157913a68e1a30744cd46ae82cee Reviewed-by: Liang Qi <liang.qi@digia.com>
* Dialog: Add missing docsShawn Rutledge2014-07-091-2/+2
| | | | | | | Also fixed a qWarning and updated example import statement. Change-Id: I873b52e297bbefe66c6c131573804eee98c40a2f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Replace module includes in dialogsAndrew Knight2014-03-111-0/+1
| | | | | | | | Replace a number of QtQml module inclusions with their more specific counterparts, possibly leading to decreased compilation time. Change-Id: I9b48b06e884d46c6440725a704951dc87e2e93db Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QtQuick.Dialogs: added Dialog: wrapper for arbitrary contentShawn Rutledge2014-02-151-0/+14
| | | | | | | | | | | | It provides only a button box, so the application developer can supply the rest of the dialog contents. This is useful for various kinds of dialogs that prompt the user for input. [ChangeLog][QtQuickDialogs][Dialog] Dialog is a new wrapper component for dialogs with standard buttons and custom content items. Change-Id: I0434bed5f504820dc0a668cb993a94980f99852a Reviewed-by: Liang Qi <liang.qi@digia.com>
* move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-031-0/+216
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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 19:35:05 +0000