aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform
Commit message (Collapse)AuthorAgeFilesLines
* Update to latest qml CMake APICraig Scott2021-06-0567-9435/+0
| | | | | | | | | | | | | | The new qml CMake API places a closer relationship between the backing target and the plugin target. Both are typically created together and they share a lot of common details. Instead of creating them in different parts of the source tree, they are now specified together. The src/imports area has effectively been absorbed into the other corresponding subdirectories below src with this change. Task-number: QTBUG-91621 Change-Id: I9bd32e9eb78c198ccc9db04e2829303cac323502 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix build without features.shortcutTasuku Suzuki2021-04-271-0/+2
| | | | | | Change-Id: I871e115f27c3c43a9e9b2e23392cd1dcbfb0cec0 Pick-to: 6.1 6.0 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Use \qmldefault instead of \defaultPaul Wicking2021-03-233-3/+3
| | | | | | Task-number: QTBUG-81525 Change-Id: I1b79fde191bfe0ac11778baf352409ace4cd5a56 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Generate and install qmltypes for all pluginsMaximilian Goldstein2021-03-181-1/+2
| | | | | | | Pick-to: 6.1 Change-Id: Ib6f0aa7d2fe663f8d1ba090d2c62d57e0073a526 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Change section titles that cause bad linksPaul Wicking2021-03-111-3/+3
| | | | | | | | | | | Section titles are valid targets for QDoc's autolinker. When they are identical to other valid link targets, such as for example a class, these sections may cause invalid links. Pick-to: 6.0 6.1 Task-number: QTBUG-91141 Change-Id: I466b2d21be030cd34b2a734d5126c45ff763127b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Remove redundant qmldir filesAlexey Edelev2021-02-231-3/+0
| | | | | | | | | | qmldir files to be generated by the cmake build procedure and don't need to be stored in the source tree. Task-number: QTBUG-88263 Change-Id: Idff2800b5b2b6cb74d79a2f42fff717522c10ade Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove QMake project filesJoerg Bornemann2021-02-112-124/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I4247294258629c92e80914518e9208019090c815 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add qtqmlmodels as a documentation dependencyVolker Hilsheimer2020-12-031-1/+1
| | | | | | | | | QQuickPlatformMenu links to the Instantiator type from this module. Pick-to: 6.0 Change-Id: If59f6a64ac0144a7e6697b45e970c9f091bbb2e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Remove version numbers for import statement in snippetsJerome Pasion2020-11-261-1/+1
| | | | | | | | | | | -recommend using the import statement without versions for Qt 6.0 -update use of \qml snippet without \QtMinorVersion Task-number: QTBUG-87155 Pick-to: 6.0 6.0.0 Change-Id: I338d4fb81b9709f2f342f250c07ddf66f116b1dd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Tag porting guides so that they show up in the listVolker Hilsheimer2020-11-171-0/+2
| | | | | Change-Id: I58a307b1bfae55b6c0b4d9663db817bea50b6b34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Follow up on change of QQmlListProperty to qsizetypeVolker Hilsheimer2020-11-116-26/+26
| | | | | | | | | | | | | This deals with d7008c79d4ec023527ebfc118ad47f40075f244d in qtdeclarative which aligned QQmlListProperty with our container types. Note: not changing the respective APIs of the QQuick classes in this change. Ie. QQuickPlatformMenu::insertItem still operates on int as index, and QQuickMenuPrivate still stores currentIndex as int. This might need to be addressed in a follow-up commit. Fixes: QTBUG-88362 Change-Id: Ia663cfa47fa91c55997cdef288b2a866107a5f25 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Rename "Porting" pages to "Changes"Jerome Pasion2020-11-092-2/+2
| | | | | | | | | | | | | | The content in the porting guides are closer to a changelog than a porting guide. At this point, it is easier for maintainers and contributors to write in a changelog than a guide. This change should help with readability and is closer to the usage of "Changes" in documentation. Part of a rename in other submodules. Task-number: QTBUG-87156 Change-Id: Ib34fc9e3e5719c75fcd7d18d9d2cc7dd994c3116 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Qt Labs Platform - Qt 6 porting guideMitch Curtis2020-11-091-1/+14
| | | | | | Task-number: QTBUG-88158 Change-Id: Idce6ec14216d5f09b4cc729677b17084defdee1b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: remove all instances of \qmlpropertygroupMitch Curtis2020-11-094-4/+0
| | | | | | | | This is apparently no longer necessary. Pick-to: 5.15 Change-Id: I0f45a84ced5118d248ffab4e745c4e2f2ce5738f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: fix Qt Labs Platform Menu icon documentationMitch Curtis2020-11-091-4/+4
| | | | | | | | It was probably copy-pasted from MenuItem. Pick-to: 5.15 Change-Id: I20f7e107252346f52bf8c061fe18e1ca6a0bf150 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: Fix qdoc warningsVenugopal Shivashankar2020-11-061-1/+1
| | | | | | | | | | | Mostly broken links to types and properties that are either dropped or renamed. Task-number: QTBUG-88141 Fixes: QTBUG-88141 Change-Id: I44789cdd1b8560a967b0b3868fd637deef488d88 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix deprecation warnings related to QMetaTypeFriedemann Kleint2020-11-021-4/+4
| | | | | Change-Id: I4e6c1b03915c33f6225c0fb7f86e6acb7715cd4d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* CMake: Fix no-widgets buildAlexandru Croitor2020-10-212-6/+108
| | | | | | Task-number: QTBUG-86053 Change-Id: Ia2e3c3d0164550bb77b73edb3ef8f5e634e09ea7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Only add a shortcut if the sequence is not emptyAndy Shaw2020-10-081-2/+6
| | | | | | | | | If the sequence is empty then reset m_shortcutId to -1 so it does not have a shortcut attached to it. Change-Id: I16945950145d9d3ca7da73e998b28d64997501d0 Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-071-11/+11
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I4a690095fcd4b1141550de86b6820ae2dd579429 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Doc: Add Qt 6 changes filesPaul Wicking2020-09-242-0/+46
| | | | | | Task-number: QTBUG-84051 Change-Id: Ibfd1750b571f65bf76a3922f89510b6c6fd4eff9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix more compiler warnings from deprecated application attributesVolker Hilsheimer2020-09-161-1/+0
| | | | | | | | | Also cleanup documentation, with the exception of the "High-DPI Support in Qt Quick Controls" page, which needs to be either removed or rewritten after some fact checking. Change-Id: I3cdf1f8554f8f26627a9a5f17c2ee0038c933468 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove all plugins.qmltypes filesMitch Curtis2020-08-261-492/+0
| | | | | | | | | These files should now be automatically generated by both qmake and cmake. Task-number: QTBUG-82922 Change-Id: I3ba754bb343123442c7d56c9caf770a979489c7d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix CMake buildMitch Curtis2020-08-261-2/+2
| | | | | | Task-number: QTBUG-82922 Change-Id: I75f4a553a6bb260f77bfa791f12fa42e80131e09 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Register C++ types declarativelyMitch Curtis2020-08-263-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt to the new way of registering C++ types. The types need to be seen at compile time so that code can be generated that invokes them. This patch: - Adds QML_* macros where applicable. - Adapts the build system files to the new way of registering modules. - Splits up the QtQuick.Controls[.*].impl files into their own plugins, as we can only register one QML module per .pro file. - Removes C++ type registration calls in every plugin. - Moves private types from src/quickcontrols2/quickcontrols2.pro to src/quickcontrols2/impl/quickcontrols2-impl.pro. Some of these types need to be exposed to QML, but quickcontrols2.pro is already in use to declare the QtQuick.Controls import (and also provides the public C++ QQuickStyle API), and the new QML_IMPORT_NAME/VERSION syntax only allows one module per project. As some of the types that need to be exposed to QML are also referenced by some C++ code (e.g. tests, etc.), we just move all of the private types to the new library. Follow-up patches will register the QML types declaratively. Task-number: QTBUG-82922 Change-Id: Iaf9ee106237d61701d57a8896f3822304c8151a6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Use QList instead of QVectorJarek Kobus2020-07-091-1/+1
| | | | | | Task-number: QTBUG-84469 Change-Id: I4991ab7ce8ba8d2522005b1b0a78f7b474c54419 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-301-2/+2
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I92ef02ede041d3965151165a479a1ea0549cc0f9 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Qt6: Port QtQuickControls2 to QStringViewKarsten Heimrich2020-06-101-7/+7
| | | | | | Task-number: QTBUG-84319 Change-Id: I7aaae36df79b1a935a3c4d31039cb880405f0d63 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-093-5/+5
| | | | | | Task-number: QTBUG-84469 Change-Id: Ic36741d2bcaec8d5e5dc96638b7122f8ce51bdb2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Platform: remove deprecated iconName, iconSource APIMitch Curtis2020-06-056-160/+2
| | | | | | | | | | | | | [ChangeLog][Platform][Menu] The deprecated iconName and iconSource properties were removed. Use the icon property instead. [ChangeLog][Platform][MenuItem] The deprecated iconName and iconSource properties were removed. Use the icon property instead. [ChangeLog][Platform][SystemTrayIcon] The deprecated iconName and iconSource properties were removed. Use the icon property instead. Task-number: QTBUG-84715 Change-Id: I91a8ceb1a291b78fc342756de24e18b818a49b4b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Remove winrtOliver Wolff2020-06-053-3/+0
| | | | | | | Task-number: QTBUG-84434 Change-Id: I2806245870f66b508a4e6afd198efbb865b9a373 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove the shortcut when the menu item that is using it is removedAndy Shaw2020-06-041-0/+10
| | | | | | Change-Id: I58ae027a6a913f45f7b3fad020c290c4d75804da Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Sync the platform menu after inserting it to the menubarAndy Shaw2020-06-031-0/+1
| | | | | | | | | By syncing the platform menu, we ensure that it passes on the title of the menu to the native handle if it was dynamically added. Change-Id: Idd11fa7d9cd3d251e2ed19f99f575f5e2ec5ac1d Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Sync the QQuickPlatformMenu so it has a handle ready when its a sub menuAndy Shaw2020-05-291-2/+7
| | | | | | | | | | | | When dynamically creating a menu, it will be parented after it has created the handle the first time around. Therefore it loses the original handle and does not get a new one when needed. So by calling sync() before it is set as the sub menu then it can get a handle created if necessary in time. Change-Id: Ia39f49f99758802dd19ff1df478b05ac5e403ea8 Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Account for single key shortcuts being used in the platform menusAndy Shaw2020-05-274-1/+38
| | | | | | | | | | When a single key shortcut is used then it does not go through the usual channels for triggering. Therefore it needs to be registered as a shortcut so it can be picked up when sent as a Shortcut event. Pick-to: 5.15 Change-Id: I93a48c633e1051f142b884d78bbca181c778f7b9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Qt.labs.platform/MenuItem 1.1: expose iconIvan Tkachenko2020-05-153-4/+8
| | | | | | | | | | [ChangeLog][Platform][MenuItem] Expose MenuItem.icon.* property when imported as revision 1, which was erroneously not exposed at all. Task-number: QTBUG-84102 Pick-to: 5.15 Change-Id: I6d400c7d4e222b67c99b6f5a95ac66e0851630f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update includes of QAction after move from widgets to gui in qtbaseVolker Hilsheimer2020-03-312-2/+2
| | | | | Change-Id: I1e2ab9678468d5fa0b4653a6edd5353c5eb5f8a1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-311-2/+2
|\ | | | | | | Change-Id: Ie09cfdd17b00e56f3ba8677d25b24417dd4e42f6
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-211-2/+2
| |\ | | | | | | | | | Change-Id: I9ecddc7a68da4f15ee2c2904e237496eb6a2aa26
| | * Doc: Make sure import is highlightedKai Koehne2020-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use \qml ... \endqml to allow qdoc highlighting the import as QML. Also parameterize the example import QtQuick.Templates import so that it always uses the last import version. Change-Id: I3fecc8b301c58a89769caf5aa3a764551ff683b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-1713-20/+46
|\ \ \ | | | | | | | | | | | | Change-Id: Ieb9bcfba9651d646509afd065ce2389ef74448cc
| * | | Fix build failures as a result of QMetaType changes in qtbaseAlexandru Croitor2020-03-126-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc now stores the QMetaType of properties as a result of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires full type information about the property type inside the moc generated source file. Many of the property types were forward-declared, and this resulted in build errors like "invalid application of 'sizeof' to an incomplete type 'QQuickTransition'" Make sure to explicitly include the moc files inside the counterpart .cpp files, so that full information is available from included headers. Fixes: QTBUG-82774 Change-Id: I5971713864992398daed72ce9f6ab866668cf8e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I3ed1abd00bf54da654c9ccade427f5756b99b595 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Fix warnings about deprecated QQmlListProperty APIFriedemann Kleint2020-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Pass the list by pointer, fixing: qquickplatformdialog.cpp:122:50: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QObject]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations] Change-Id: Icad2c2fd6398b542405c0523d9169d72b8305cc8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-3013-16/+30
| |\| | | | | | | | | | Change-Id: Icb923b10d2b6c524ebaa8b38c7979b780e3582d4
| | * Doc: Fix qdoc warningsVenugopal Shivashankar2019-11-2613-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warnings were about: - Undocumented function parameters - Instances of \instantiates that us an internal class - A few link issues Task-number: QTBUG-79827 Change-Id: I60094279c7da6bc446b5c63b7b4924b71cee4672 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-252-2/+2
| |/ | | | | | | | | | | | | It is being deprecated. Change-Id: I69effb678ee29d9c98bdd51dc898845869211bcf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-2511-0/+0
|\| | | | | | | Change-Id: I61919fabd4a3a07ed374f2c3c1fae2d589d6e124
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-0511-0/+0
| |\ | | | | | | | | | Change-Id: I4b970036bdb5d312b0dc5cb1bcbd8e161e3d4c7e
| | * Run optipng on all imagesMitch Curtis2019-11-0411-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | find . -name "*.png" -exec optipng -o 7 -strip all {} \; Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d Fixes: QTBUG-79275 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>