aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-071-3/+32
| | | | | | | Task-number: QTBUG-73484 Change-Id: I5c6019ec015a7d423dcc103d1acf23383c5b6239 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Qt.labs.platform.FileDialog not honoring folder propertyPaolo Angelelli2019-01-232-1/+6
| | | | | | Fixes: QTBUG-73179 Change-Id: I99fb1c7cfcf61920889da909152b23b40bc96104 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-291-1/+4
| | | | | | | | | | The name of the documentation module is also changed from 'qtquickcontrols2' to 'qtquickcontrols', and this is reflected in other modules' dependencies and licensing source files (qt_attribution.json). Task-number: QTBUG-70333 Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-181-1/+1
|\ | | | | | | Change-Id: I828b8ea2fef35e4e7ab0bb594e683f8643c793a1
| * QQuickPlatformColorDialog - properly initialize platform dialog helperTimur Pocheptsov2018-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | QCocoaColorDialogHelper in its setCurrentColor does some initialization (using NSColorPanel) and required its 'm_options' to be set by this point. So, first set options, then current color. Task-number: QTBUG-69839 Change-Id: I9092c80a511890e958de5b99a9614feb134dba7e Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | qquickplatformmessagedialog: fix build errorMitch Curtis2018-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | Not sure why it's considered ambiguous, but since it's an unknown value, it's fine to print it as an int. Task-number: QTBUG-69916 Change-Id: I50335bd140626aa220e0468aef0fd1b3b34e3042 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | Fix build with '-no-feature-action' configurationValentin Fokin2018-07-241-0/+2
| | | | | | | | | | Change-Id: I6a1488ef128f64184dccdd28aa12ff83f9975154 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Doc: fix SystemTrayIcon::icon.maskJ-P Nurmi2018-05-241-1/+1
| | | | | | | | | | Change-Id: Ifcfd6f57528784b192eeeb39b3d3672459a0327c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+0
| | | | | | | | | | | | | | | | | | 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: Ic3fa0827ee6719b0a22f73b48667deb129089a6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: add icon.maskJ-P Nurmi2018-04-206-2/+24
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform][Menu] Added icon.mask grouped property. [ChangeLog][Platform][MenuItem] Added icon.mask grouped property. [ChangeLog][Platform][SystemTrayIcon] Added icon.mask grouped property. Task-number: QTBUG-67730 Change-Id: Idf8031b39038fb6b6774ebd2a2dcb32297465a40 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: make icon a grouped propertyJ-P Nurmi2018-04-2012-111/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform][Menu] Deprecated iconName and iconSource properties in favor of icon.name and icon.source grouped properties. [ChangeLog][Platform][MenuItem] Deprecated iconName and iconSource properties in favor of icon.name and icon.source grouped properties. [ChangeLog][Platform][SystemTrayIcon] Deprecated iconName and iconSource properties in favor of icon.name and icon.source grouped properties. Task-number: QTBUG-67730 Change-Id: I08bbb2bb5ed2aaae02f9264c63fb6cfa04240a74 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add SystemTrayIcon::geometryJ-P Nurmi2018-04-184-2/+24
|/ | | | | | | | [Changes][Platform][SystemTrayIcon] Added geometry property. Task-number: QTBUG-67623 Change-Id: I5ef278398dfc660efdf58d36d9cdf1fede0d2e7c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix current color is not set first time in ColorDialogTasuku Suzuki2018-03-261-0/+1
| | | | | | Task-number: QT3DS-1363 Change-Id: Id464f3373bdc486060dcd1e351ffe29c55d85696 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickPlatformMenu: fix crash on exit with submenusMitch Curtis2018-03-082-4/+17
| | | | | | | | | Ensure that we unparent submenus in destroy(), not just in the destructor. Task-number: QTBUG-66889 Change-Id: I18b5fc28ee47a50f511ef4f8cf55cfdcbae9bfec Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickPlatformMenu: fix submenu titles not being visibleMitch Curtis2018-03-071-0/+3
| | | | | | | | | As with other properties in QQuickPlatformMenu, ensure that we set the relevant property on the internal QQuickPlatformMenuItem. Task-number: QTBUG-66876 Change-Id: Ie37d874426200014ea3bb4045bc6b566422221de Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: add an example of submenus and dynamically generated menu itemsMitch Curtis2018-03-061-0/+62
| | | | | | Task-number: QTBUG-66874 Change-Id: I1e34039e4fa0344b1efdcb2977586d97ada6b31e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Platform: fix checkable MenuItemJ-P Nurmi2018-03-012-10/+8
| | | | | | | | Update the internal checked state before emitting triggered() Task-number: QTBUG-66386 Change-Id: If120955681b2011bf88126a1ca6032f0af482824 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-2/+4
|\ | | | | | | Change-Id: I6450d9ea1e5e2081e5ed79f02d485515b582c4f0
| * QQuickPlatformMenu::open(): Scale target rectangleFriedemann Kleint2018-02-011-2/+4
| | | | | | | | | | | | | | | | The QPlatform* classes operate in native pixels. Task-number: QTBUG-55251 Change-Id: Ic9715bc062f7459054ed9735d133b1a5d05b60a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-154-3/+8
|\| | | | | | | Change-Id: Ide4b85626dd153b534c39a3afa2f3b9e732badf5
| * Qt.labs.platform: declare and register enums to the meta systemJ-P Nurmi2017-11-064-3/+8
| | | | | | | | | | | | | | | | | | To make them correctly available in QML so that they also work as signal arguments. Task-number: QTBUG-64259 Change-Id: I5fa00871f96357d924661c4b8af323a0f1748c9d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-124-12/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/quicktemplates2/qquickbuttongroup.cpp src/quicktemplates2/qquickoverlay.cpp tests/auto/controls/data/tst_buttongroup.qml Change-Id: Iae23aaf039c6095007966475294e93220dbead84
| * QQuickPlatformDialog: fix clazy-qenumsJ-P Nurmi2017-10-101-1/+1
| | | | | | | | | | Change-Id: I6b9e31919502fb2f47e4b3657302a745c9f85b23 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Platform: fix clazy-range-loop findingsJ-P Nurmi2017-10-103-11/+11
| | | | | | | | | | | | | | Avoid accidental detach with C++11 range for loops. Change-Id: I2a105ef5a2505d26ee086974177f8f1e4040b522 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-07-211-0/+6
|\| | | | | | | Change-Id: Idb1895dae2870dbed860ba3106fe52b01d733504
| * Fix unused parameter errors in qwidgetplatform_p.hJason Erb2017-07-141-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-61950 Change-Id: Idbc6bcc8f08dcccc50b409a055ab6c35e1f9aef8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove setTag/Tag overridesAlbert Astals Cid2017-04-214-30/+2
|/ | | | | | | The base class now provides implementation for them Change-Id: I6e0eb165c3cead26683da8e3c76cd0a0203ff649 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* SystemTrayIcon: Fix documentation code snippetv5.9.0-beta2Friedemann Kleint2017-04-111-1/+1
| | | | | | | MenuItem provides signal onTriggered(). Change-Id: Id61aee07d0463bc66a9e50d931a791fc4e0783c2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-systemtrayiconPaul Olav Tvete2017-03-106-11/+34
| | | | | Change-Id: If991e2311f37c1977cdf2a913b3f022e5f999f5f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-082-0/+4
| | | | | Change-Id: I89c037629037a73fd481d29b28bd15b1ba57af09 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-menuPaul Olav Tvete2017-03-081-0/+2
| | | | | Change-Id: I5e8afbf0aa1704a13d359e7ddf867cd791b3f0db Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-texteditPaul Olav Tvete2017-03-081-0/+2
| | | | | Change-Id: I606e0e68c16faceaddbddacb37eec7d557e184ce Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Platform Menus: support sub menus in the Qt Widgets fallback menusJ-P Nurmi2017-03-084-13/+26
| | | | | | | | | Implement all the missing things and fix the type of the cast in QWidgetPlatformMenuItem::setMenu() to make sub menus work with the widgets fallbacks. Change-Id: I19bb010a5c639a77b76d1d92a47ad03576c06d2f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Port from QT_NO_CURSOR to QT_CONFIG(cursor)J-P Nurmi2017-02-241-1/+1
| | | | | Change-Id: If7dd96ed25b1183586b903503b160fdeaef1ccea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-242-8/+8
| | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Platform: respect the configurable features in Qt Widgetsv5.9.0-alpha1J-P Nurmi2017-02-102-19/+88
| | | | | | Change-Id: I4a0696e4f897a378e3944c7948ba00e5f2038f5d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix -no-feature-shortcut buildJ-P Nurmi2017-02-071-0/+2
| | | | | Change-Id: If567b99889b40528150834c3319cdfec8e5b229e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QtQuickControls2: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-131-1/+1
| | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I94123464b12b30a4ba085cfb7b606bc26df9b76e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-1148-48/+48
|\ | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * Welcome to 2017J-P Nurmi2017-01-0948-48/+48
| | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-021-1/+1
|\| | | | | | | | | | | | | Conflicts: src/imports/platform/qquickplatformmenuitem.cpp Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d
| * Doc: fix linking error to "Qt for OS X/macOS"J-P Nurmi2016-12-211-1/+1
| | | | | | | | | | Change-Id: I285ea1b331314c7b3927d7f8ab9f2c367e73ede5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Whitespace cleanupsJ-P Nurmi2016-11-031-1/+1
|/ | | | | Change-Id: Ia075694a7dc43d72d07221b569467fcebdb411fb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-10-051-1/+65
| | | | | Change-Id: I276dbd1464577fdee9c6920deb38e890c1a18daf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix FileDialog::selectedNameFilter review findingsJ-P Nurmi2016-09-146-21/+242
| | | | | | | | | | | | | | | | FileDialog::nameFilters contains an array of name filter strings that combine the name and extensions. For example: - "Text files (*.txt)" - "HTML files (*.html *.htm)" When dealing with multiple name filters, it is quite clumsy to use a string type of 'selectedNameFilter' which is one of the above full file name filter string values. Make it possible to read/write the index of the selected name filter, and provide the filter's name and extensions separately. Change-Id: Ie416cc4ab3dcde93c10769b6f7ac44915307f194 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Platform: add experimental StandardPathsJ-P Nurmi2016-09-136-3/+265
| | | | | | | This complements the File/FolderDialog offering. Change-Id: I44a105724321092a6efc4126c8fb25f7d31b77e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add example snippet to FileDialog::nameFiltersJ-P Nurmi2016-08-251-0/+6
| | | | | Change-Id: Iac753e53ff838d232365c13b92e150d528daef2a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Platform: widget-based fallbacks no longer need to check availabilityJ-P Nurmi2016-08-166-143/+80
| | | | | | | | | | | It is done in qwidgetplatform_p.h createWidget() outside QT_WIDGETS_LIB guards so you get the important warnings even in -no-widgets builds. Now that the widget platform instances are created only when really available, they can unconditionally instantiate the respective widget, which simplifies the code quite a bit. Change-Id: I7430f8e803050e43edb3af3a139b0508445f6a37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Platform: offload widget fallback creation to qwidgetplatform_p.hJ-P Nurmi2016-08-155-53/+65
| | | | | Change-Id: If51b359fa44a539c236e1a070e69451c75e190f7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Platform: align logging outputJ-P Nurmi2016-08-154-4/+9
| | | | | Change-Id: I3438e1da864f6d7c710e4770f12aa2596f091a9d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>