summaryrefslogtreecommitdiffstats
path: root/src/dialogs
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-2515-44/+44
| | | | | | Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+0
|\ | | | | | | Change-Id: If2e68359e05a5be8db3330ba9af6245c50eab8ba
| * Change the fsType of icons.ttf to allow installing the icon fontShawn Rutledge2020-05-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | Used https://metacpan.org/pod/distribution/Font-TTF-Scripts/scripts/hackos2 to change the fsType from 8 to 0 in the OS/2 table. /usr/bin/site_perl/hackos2 -t0 src/dialogs/qml/icons.ttf icons.ttf Fixes: QTBUG-84086 Change-Id: Idc72ca04d5c71bb049c7d6d2c0cd9b40739c2321 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-311-0/+2
|\| | | | | | | Change-Id: Ie8fd52e91dd0ee6ba504095ba2aec0866046f6c3
| * Docs: recommend to use QtQuickControls 2 Dialog on Androidv5.15.0-beta4v5.15.0-beta3Assam Boudjelthia2020-03-201-0/+2
| | | | | | | | | | | | Fixes: QTBUG-82781 Change-Id: I98bb77d9118d05b16235cc1107d6e7a74b70fc65 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Compile controls after changes in the meta system that broke itJan Arve Saether2020-03-255-0/+10
|/ | | | | | | | Problem was that moc needs to have the full definition of the types, it's not sufficient for it to have a fwd-declared type anymore. Change-Id: Ie1f1402d53e4336cd4afd018f5ae4dbdc88118c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-271-5/+0
| | | | | | Task-number: QTBUG-82253 Change-Id: Ia4f49f7923d266e669d257d14319f3537105a1ac Reviewed-by: Kai Koehne <kai.koehne@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>
* Add missing depends entry for QtQmlAndy Shaw2019-11-061-0/+1
| | | | | | | Fixes: QTBUG-79794 Change-Id: I1095563250cf872080843670ad1d92b896db38a3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypes for 5.14Kai Koehne2019-10-232-448/+292
| | | | | | Task-number: QTBUG-78690 Change-Id: I3d6c4c3239107b25731d8e355c774a6b8b70a601 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Make restoreMode on all Binding elements explicitUlf Hermann2019-10-041-2/+5
| | | | | | | The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | Task-number: QTBUG-74391 Change-Id: If30143e106fec5a8694c47ab2376aeda36faf8e1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-203-11/+8
|\ | | | | | | Change-Id: I4bb2b57f7f091074b0c4d17cad4748843e806dd0
| * Create the decoration component when it is neededAndy Shaw2019-04-163-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-061-0/+2
|\| | | | | | | Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
| * Dialog: Update the title on the window when changing it on the dialogAndy Shaw2019-03-291-0/+2
| | | | | | | | | | | | Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c Fixes: QTBUG-74350 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-132-2255/+340
| | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | DefaultFileDialog: Don't assign QQmlComponent* to QQuickItem*Ulf Hermann2019-01-241-2/+1
| | | | | | | | | | | | | | | | This used to work, but it's really, really evil. Change-Id: Icd214f7718737600b5c77cdbd72008aa61438729 Fixes: QTBUG-73223 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix FileDialog not working with UNC pathsMiguel Costa2018-11-071-0/+2
|/ | | | | | | | | | | | | Excluded from the Windows build a fixup for QUrl's containing too many leading '/'. The fixup was applied on calls to setFolder(const QUrl &f). It was mangling UNC (i.e. network) paths in Windows, causing QQuickFileDialog to reject them. The fixup was introduced in: 48c4c010095e851da3e58ac98514e29dff2e1262 Fixes: QTBUG-67932 Change-Id: Iaab98da9f014156c1d763a57b60ecad41be2e77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Dialogs: allow preventing processing of standard buttonsAlberto Mardegan2018-06-292-15/+76
| | | | | | | | | | | | | | | | | Add an actionChosen() signal to DefaultDialogWrapper, allowing the developer to stop further processing of the event by setting the "accepted" field to false. This is especially useful when some validation on the dialog contents need to take place before the dialog can be accepted. [ChangeLog][Dialogs] Add a signal to the Dialog class to allow the client to intercept the button presses and optionally prevent further processing of the event. This allows performing some validation on the fields before dismissing the dialog. Task-number: QTBUG-69095 Change-Id: I19bca0bd9fcbafc72d337a5870776a96634ba748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-272-16/+2
| | | | | | | | | 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>
* iOS: Be more explicit about how to get access to the native image pickerAndy Shaw2018-04-161-1/+3
| | | | | Change-Id: I24c265698d118544a470ac91c54d57895544a5ac Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Do not treat winrt as touch based mobile platformv5.11.0-beta4Oliver Wolff2018-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | 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-129-52/+52
| | | | | | Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-121-1/+9
|\ | | | | | | Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-1/+9
| |\ | | | | | | | | | Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
| | * Document licensesKai Koehne2018-01-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Every module should state the licenses it is available under in it's landing page. Change-Id: Ib2d5f49e57f7f34bf06a558725dcb53152561f8d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-204-7/+4
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-194-7/+4
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/dialogs/qquickabstractfiledialog_p.h tests/auto/controls/data/tst_combobox.qml Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
| | * Doc: Change wording on when module was introducedKai Koehne2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Change to past tense. Change-Id: I623ecbf4586b9212ceba5be15f18b0946b2de884 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Fix DefaultFileDialog binding loop warningsMitch Curtis2018-01-152-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove change signals from the shortcuts and __shortcuts properties, as they don't change after being populated for the first time. Task-number: QTBUG-53707 Change-Id: If305a6d63ebd98e6082fc5b7d89a63aaab6c1f43 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Dialogs: Fix minor memory leak in QQuickAbstractDialogJarkko Koivikko2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Dialogs decoration component is not an Item based object, there is a minor memory leak in error cleanup path, causing the object to leak. Change-Id: I79295378303e460ad0024d5994fed28ddd37b591 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-181-0/+2
|\| | | | | | | | | | | Change-Id: Ie66ca17fe8ea49b3637accb468e206657346f4ab
| * | Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Previously the list was maintained in qtbase. Change-Id: I0510653c08e2e82f949084c5f0e3b1dcae3a81bf Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-015-3/+30
|\| | | | | | | | | | | Change-Id: Iadff14f78c9d4b5aca9cba8a2728c10b7963d8fc
| * | Add support for the defaultSuffix property in FileDialogAndy Shaw2017-09-175-3/+30
| |/ | | | | | | | | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* / Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-222-6/+6
|/ | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix support for using QtQuick Dialogs with the QML compilerSimon Hausmann2017-06-011-6/+9
| | | | | | | | | | This is a regression from commit dacb91916b202208681471ba764504c7c7d086f0. Make sure to include the dialogs sources in the resource system when using the compiler. Task-number: QTBUG-60991 Change-Id: I35c3e2e677e4f44ec56fe02b086ce08a8b765d37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix inclusion of QML files of the Dialogs module in static buildsv5.9.0-rc2v5.9.0-rc1v5.9.0Simon Hausmann2017-05-221-27/+1
| | | | | | | | | | | | | | This is a regression introduce by commit 751f08cf46f505980b8ebe9a228a6c229b470152. For a build with QML Ahead-of-Time cache creation, we need the qml files in QML_FILES and qml_module.prf takes care of installing them correctly into the file system (caches and sources). For a static build we also need the sources in QML_FILES, in order for their automatic inclusion in the resource system (also by qml_module.prf). Task-number: QTBUG-60861 Change-Id: Id9125530d8b385101994600c1224dbcb2a5333f9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Connect to QQuickWindow::visibleChanged using QObject member syntaxTor Arne Vestbø2017-04-181-2/+2
| | | | | | | | | | | To disambiguate from QWindow::visibleChanged. Otherwise we get a warning at runtime: QMetaObject::indexOfSignal: signal visibleChanged(bool) from QQuickWindow redefined in QQuickWindowQmlImpl Change-Id: I95f984cface59cd7ec5710235959a1054b26275a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-111-2/+6
| | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@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>
* Build fix for -no-feature-regularexpressionPaul Olav Tvete2017-03-031-0/+2
| | | | | Change-Id: I211a325b0bd5fb1e5d48b1d378cdce39acb84c96 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Only remember the folder for the next time if the dialog is acceptedAndy Shaw2017-02-212-1/+7
| | | | | | | | | | | If the dialog is not accepted then it should not remember the last folder that was used. This should only happen if the user clicks on OK. [ChangeLog][FileDialogs] Remember the folder only when the file dialog is accepted. Change-Id: I69957e56e887affcab9933562274013fee686063 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-2/+2
|\ | | | | | | Change-Id: I70641d4226d3851277e5d134bdbc68615b33de6a
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-2/+2
| |\ | | | | | | | | | Change-Id: I4a76c586b2e5e49616627c306dd345bdeee64b62
| | * DefaultFileDialog: check cur selection properly on okButton clickedShawn Rutledge2016-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | TableView has currentRow not currentIndex. Task-number: QTBUG-56663 Change-Id: I9376354364bc843d118a672fcd1d9dfbba8e775c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 20:50:59 +0000