summaryrefslogtreecommitdiffstats
path: root/src/extras
Commit message (Collapse)AuthorAgeFilesLines
* Add missing overrideAlexander Volkov2020-05-255-5/+5
| | | | | | Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <[email protected]>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-311-0/+3
|\ | | | | | | Change-Id: Ie8fd52e91dd0ee6ba504095ba2aec0866046f6c3
| * Fix incomplete QPainterPathv5.15.0-beta2Allan Sandfeld Jensen2020-03-101-0/+1
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: Ib481c9f8454ccc1b7398e2c03b1db16c310ec7e2 Reviewed-by: Jarek Kobus <[email protected]>
| * Fix build after header shuffling in qtbaseSimon Hausmann2020-03-101-0/+2
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: I3f3f1537f1f6c8b27306aedcd38d056e0fa984b2 Reviewed-by: Ulf Hermann <[email protected]>
* | Add missing includesJan Arve Saether2020-03-271-0/+2
|/ | | | | Change-Id: I9ad8cdc6b603896932619aba8afbef6ab12717ed Reviewed-by: Mitch Curtis <[email protected]>
* Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-271-9/+4
| | | | | | Task-number: QTBUG-82253 Change-Id: Ia4f49f7923d266e669d257d14319f3537105a1ac Reviewed-by: Kai Koehne <[email protected]>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+4
|\ | | | | | | Change-Id: Ifafbb9982454f62dcf1ccc1c5ed8661138dd01f8
| * Android: Look in the correct location for the supporting QML filesAndy Shaw2020-01-151-0/+4
| | | | | | | | | | Change-Id: I99db8554f88d39a2e9376b50bb1a6f8a334cf461 Reviewed-by: BogDan Vatra <[email protected]>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-193-3/+3
|\| | | | | | | Change-Id: I4c1a5d2aa625740a57325276098b82727b7925bd
| * Doc: Fix documentation warningsTopi Reinio2019-11-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All warnings in qtquickcontrols were related to \qmlmethod or \qmlsignal parameters, except for the missing dependency to qtcore in Qt Quick Extras. There's some inconsistencies with how QDoc parses QML method parameters, especially for qml signals - in some cases the \a command is replaced with \e to clear the warning, even though the parameter name referenced with \a does exist. This commit brings the current warning count to zero. Fixes: QTBUG-79828 Change-Id: I3d3d02583498c5a579f6476273e10e75680d940c Reviewed-by: Paul Wicking <[email protected]>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-122-0/+2
|\| | | | | | | Change-Id: I1d6fd78aa3b9ef7899a14c95c5e06b2d44458d80
| * Add missing depends entry for QtQmlAndy Shaw2019-11-062-0/+2
| | | | | | | | | | | | | | Fixes: QTBUG-79794 Change-Id: I1095563250cf872080843670ad1d92b896db38a3 Reviewed-by: Paolo Angelelli <[email protected]> Reviewed-by: Mitch Curtis <[email protected]>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-261-10/+16
|\| | | | | | | Change-Id: Ib3ca61bf2e6506242f62f4add82f0162f0a0f123
| * Update plugins.qmltypes for 5.14Kai Koehne2019-10-231-10/+16
| | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I3d6c4c3239107b25731d8e355c774a6b8b70a601 Reviewed-by: Ulf Hermann <[email protected]>
* | Adapt to new Connections syntaxUlf Hermann2019-10-205-11/+11
|/ | | | | | Change-Id: I299baf89f2530250a333736bb31f4ae470610176 Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Simon Hausmann <[email protected]>
* Make restoreMode on all Binding elements explicitUlf Hermann2019-10-044-5/+13
| | | | | | | The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <[email protected]>
* 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 <[email protected]>
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-132-18/+22
| | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <[email protected]>
* Doc: Document Qt Quick Controls explicitly as 'version 1'Venugopal Shivashankar2018-10-263-4/+4
| | | | | | | | | This is to explicitly identify Qt Quick Controls as Controls 1, so that Controls 2 can be referred generally as Qt Quick Controls. Task-number: QTBUG-70333 Change-Id: I798c0354ad47ab96978575829322a254876529fb Reviewed-by: Topi Reiniö <[email protected]>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-1/+1
|\ | | | | | | Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
| * Doc: Add missing dots (qtquickcontrols)Paul Wicking2018-06-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I3731b82ecae0a43878b694e681300bef7c36ea62 Reviewed-by: Topi Reiniö <[email protected]>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-041-3/+3
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0
| * Extras: fix remaining createRadialGradient() issuesMitch Curtis2018-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | be4c4877b35ad1b6983cf194e61f0dad1d123af5 fixed Context2D's createRadialGradient() function, so our usage of it has to be updated accordingly. This patch produces the same visual result as it was originally. Change-Id: I4c021dcb2db9303d0a4d6ae8ca4cc606ca1f6d67 Reviewed-by: J-P Nurmi <[email protected]>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-11/+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: Ieb67edec480eba18cdad29f39b262cfb8839bf8a Reviewed-by: Mitch Curtis <[email protected]>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-121-0/+9
|\ | | | | | | Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-0/+9
| |\ | | | | | | | | | Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
| | * Document licensesKai Koehne2018-01-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Every module should state the licenses it is available under in it's landing page. Change-Id: Ib2d5f49e57f7f34bf06a558725dcb53152561f8d Reviewed-by: Leena Miettinen <[email protected]>
* | | Fix memory leak in QQC1Simon Hausmann2018-02-072-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When repeatedly creating a QQuickView, loading a QML file that imports QQC1 and deleting the view again, we would leak memory that was allocated as a consequence of QML type registration in initializeEngine() callbacks that were called on every iteration. After the limitation of namespacing in the registerTypes() callback of QML module plugins has been lifted, we can move the type registrations into registerTypes() where they belong and which is called only once. Change-Id: I1d21b18dd060e169a1ee1095f5c5af7341443492 Reviewed-by: J-P Nurmi <[email protected]> Reviewed-by: Mitch Curtis <[email protected]> Reviewed-by: Michael Winkelmann <[email protected]>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-012-1/+39
|\| | | | | | | | | | | Change-Id: Iadff14f78c9d4b5aca9cba8a2728c10b7963d8fc
| * | Doc: add documentation to Dashboard examplev5.10.0-beta2Nico Vertriest2017-10-111-1/+36
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-60648 Change-Id: I79b9fdfde18041d95b7aa422bfb4d188ed907589 Reviewed-by: Mitch Curtis <[email protected]>
| * | Doc: Maintain the higlighted examples list locallyVenugopal Shivashankar2017-10-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The list is currently maintained in qtbase. Task-number: QTBUG-60648 Change-Id: I38ff28e52c1274a6cfaae66ef232e482cff38e53 Reviewed-by: Topi Reiniö <[email protected]>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-222-2/+2
|/ / | | | | | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <[email protected]>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-273-28/+6
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
| * Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-111-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <[email protected]> Reviewed-by: J-P Nurmi <[email protected]>
| * Remove qrc based default qml distribution for QQC extrasSimon Hausmann2017-04-033-25/+3
| | | | | | | | | | | | | | | | This is consistent with the other modules and prepares for the use of qml caching. Change-Id: Ifab9187ac60a52d0464c5afe46772a9da1489c73 Reviewed-by: J-P Nurmi <[email protected]>
| * Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-031-3/+1
| | | | | | | | | | | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <[email protected]> Reviewed-by: J-P Nurmi <[email protected]>
* | Calendar: make locale property publicMitch Curtis2017-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to set a locale on a specific calendar, as opposed to using the application-wide default. plugins.qmltypes was also updated. [ChangeLog][Calendar] Added locale property, which affects which day is shown as the first day of the week, as well as date and day name localization. Task-number: QTBUG-60217 Change-Id: I113298a3f3b6dd407d26f3f55ed6973e73ab6a4c Reviewed-by: J-P Nurmi <[email protected]>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-313-0/+9
|\| | | | | | | Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
| * Build fix for -no-feature-picturePaul Olav Tvete2017-03-033-0/+9
| | | | | | | | | | Change-Id: I4ace999ad45dc299a9a0d9b24c87823c762f3821 Reviewed-by: Lars Knoll <[email protected]>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-02-241-4/+4
|/ | | | | | | | Refactor QQuickMathUtils methods via them Task-number: QTBUG-58083 Change-Id: If8fca718b8512ed20244aedd89dca2bae6adec19 Reviewed-by: Mitch Curtis <[email protected]>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+1
|\ | | | | | | Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
| * fix tooltip usageTim Jenssen2016-06-201-1/+1
| | | | | | | | | | Change-Id: I305659b22f680eea903bf2e02a2998b9f71f5f5f Reviewed-by: Tim Jenssen <[email protected]>
* | Adding white space to names for item libraryThomas Hartmann2016-07-011-5/+5
| | | | | | | | | | Change-Id: If4298f002ff17e737e49b468a17de7b115570bb1 Reviewed-by: Mitch Curtis <[email protected]>
* | Revert "Fix Controls 1 types linking to Controls 2"Topi Reinio2016-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <[email protected]>
* | Fix Controls 1 types linking to Controls 2v5.7.0-rc1v5.7.0Mitch Curtis2016-05-261-0/+1
| | | | | | | | | | | | Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi <[email protected]>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Icd9ae9ef887b99b96177ec7b590fc3f35da18c82 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <[email protected]>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-104-5/+6
|\| | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-062-2/+2
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <[email protected]>
| * fix example installsOswald Buddenhagen2016-04-281-2/+2
| | | | | | | | | | | | | | this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <[email protected]>