summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove lfs config5.13Samuli Piippo2019-12-131-2/+0
| | | | | | | | codereview now supports LFS and all content has been pushed there. Change-Id: If67036aee7f6a630ca64ae44d9d0db6a6e028951 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 534cd52a3d0173739a264d2b90e517d3c5a2b65a)
* Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-11-190-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | * origin/5.12: 73ad9d6 Doc: Bump version to 5.12.6 9cb1b24 Doc: Bump version to 5.12.5 0f67624 Doc: Bump version to 5.12.4 No actual changes, just merging the stray branches towards upstream now that 5.13 is finalized & closed. Change-Id: I63c9cb9dcb5b4df93d1f38baac547213d9b7aa49
| * Doc: Bump version to 5.12.6Mikko Gronoff2019-11-042-6/+6
| | | | | | | | | | Change-Id: I9a3fb4e1acfb238f9080149ef067c512f383ad23 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Doc: Bump version to 5.12.5Mikko Gronoff2019-06-202-6/+6
| | | | | | | | | | Change-Id: I4dc3af24610a6a2681cad356e61733050aefa7f9 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
| * Doc: Bump version to 5.12.4Mikko Gronoff2019-05-312-6/+6
| | | | | | | | | | | | Change-Id: Id481c9306d06c2445759a9a99273f062c2c65310 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Doc: Bump version to 5.13.2Mikko Gronoff2019-10-152-6/+6
| | | | | | | | | | Change-Id: I84da3590941282a2bd0833bc7cf3fe9bb35d2296 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Doc: Bump version to 5.13.1Mikko Gronoff2019-08-052-6/+6
| | | | | | | | | | Change-Id: I892259c79579bb5b756a46ad3c7ebea63e0657b0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-04-2618-124/+128
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/5.12: 34310ed Split demos.xml to individual xml files 7eea480 Doc: Bump version to 5.12.3 Conflicts: doc/b2qt-demos.qdoc doc/b2qt-demos.qdocconf Change-Id: I25c43406d1940d7e7ebb0427f91a6638f4b7273d
| * Split demos.xml to individual xml filesSamuli Piippo2019-04-0418-124/+128
| | | | | | | | | | | | | | | | | | Each demo describes itself and can then be excluded from a device by not including the directory. Task-number: QTBUG-74930 Change-Id: Ica45db9dfbf1224cf7a08b83632ba90c5cc55faa Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
| * Doc: Bump version to 5.12.3Mikko Gronoff2019-03-262-6/+6
| | | | | | | | | | Change-Id: Ia95f65c4d7b8cc3acaf10dc036ee35ee513e178e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-02-064-0/+6
|\| | | | | | | | | | | | | | | * origin/5.12: f732f98 Doc: Bump version to 5.12.2 ec7cc51 Enable boot2qt launcher automatic demo mode Change-Id: Ie4b7653de8f87d6a31d3af83bc80876294f7620d
| * Doc: Bump version to 5.12.2Mikko Gronoff2019-02-062-7/+7
| | | | | | | | | | Change-Id: Ia690ab2043e27d54691b957b5d0a21db674ca412 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Enable boot2qt launcher automatic demo modeSami Nurmenniemi2019-02-044-0/+6
| | | | | | | | | | | | Task-number: QTBUG-72852 Change-Id: Id07b45185f1d033cd27f72b9ab28d23d9cb39a3d Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
* | Doc: Bump version to 5.13.0Mikko Gronoff2019-02-042-7/+7
|/ | | | | Change-Id: Ia04c904b11cd0ec6d263783cbf6515b0fd1d7bed Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Doc: Bump version to 5.12.1Mikko Gronoff2018-12-102-6/+6
| | | | | Change-Id: I60c822cb0a16f5e818b92724ece4657084d3bff7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Revert "emulator: exclude e-bike demo from launcher"Mikko Gronoff2018-12-101-1/+1
| | | | | | | | Should work now for emulator too. This reverts commit 0fad7db4b7d34972b5b11fe31ceede43b3e6d0ea. Change-Id: I190c793380b02ae38a4d3f970c5d5f325dad8e36 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-12-100-0/+0
|\ | | | | | | | | | | | | | | | | | | | | * origin/5.11: c1352db Doc: Bump version to 5.11.3 Conflicts: doc/b2qt-demos.qdoc doc/b2qt-demos.qdocconf Change-Id: I428063bca6edb76a659d34bf4b4d7d7e8f1f5cab
| * Doc: Bump version to 5.11.35.11Mikko Gronoff2018-11-272-6/+6
| | | | | | | | | | Change-Id: I21a7d3fec0e5161d0c173e347f28f369b9375a71 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | emulator: exclude e-bike demo from launcherMikko Gronoff2018-11-191-1/+1
| | | | | | | | | | | | | | | | due QTBUG-71752. This commit will be reverted if/when that bug gets fixed. Change-Id: Ib2a92efd5fa8130bbb443f0322b5dfa1eddd2c46 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | ebike: use Moment.js correctlySamuli Piippo2018-11-141-1/+1
| | | | | | | | | | | | | | | | Fix "TypeError: Property 'unix' of object [object Object] is not a function" Task-number: QTBUG-71748 Change-Id: Ic8425c68271c7b57880f9a36ad03cbf3e5453461 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* | ebike: use Moment.js correctlySamuli Piippo2018-11-131-1/+1
| | | | | | | | | | | | | | | | Fix "TypeError: Cannot call method 'unix' of undefined" Change-Id: I940783d2397792ee8ad0cd0f612b4779f7b1f40d Task-number: QTBUG-71748 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
* | SensorTag: Fix qml warningMaurice Kalinowski2018-11-051-3/+3
| | | | | | | | | | | | | | Prefer Layout properties instead of anchors. Change-Id: Ic5d958c1e9cb1060b81eb85003db1d198ee6fd4a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | SensorTag: Update QML filesMaurice Kalinowski2018-10-312-2/+1
| | | | | | | | | | Change-Id: Ibde6e12d29d422fa27f7fc98c2c54eb170c28638 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | SensorTag: Fix warnings and cleanupMaurice Kalinowski2018-10-255-38/+44
| | | | | | | | | | Change-Id: I2caf3353eebed6dfa3153b94ae88d1653ad7805a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | SensorTag: Prefer loading MQTT configuration from fileMaurice Kalinowski2018-10-254-15/+79
| | | | | | | | | | | | | | | | | | To avoid accidently pushing credentials, they should not be patched into the header, but rather be placed in to a file co-located to the executable. Change-Id: I03950107f39a88b0f1c7deb49ff16d25ddf9df4d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | qt3D demo: remove advanced custom materials demo from launcherMikko Gronoff2018-10-041-0/+2
| | | | | | | | | | | | | | more HW friendly 3D demo will be added later on. Change-Id: I7e83158a12cedc870df2f11ae13938118674422f Reviewed-by: Kari Hormi <kari.hormi@qt.io>
* | Qt3D demo: Add doc image & fix resource pathsMikko Gronoff2018-09-242-1/+1
| | | | | | | | | | Change-Id: I7fd472387ee922f472d8ad330dbc18eda313ab74 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-09-211-2/+15
|\| | | | | | | | | | | | | * origin/5.11: 7e1d96e Use Material style only on devices with gpu Change-Id: Ia0a48b7d6d3fde45cb4c68344a663ed15bf0d3c9
| * Use Material style only on devices with gpuSami Nurmenniemi2018-09-211-2/+15
| | | | | | | | | | | | Task-number: QTBUG-70493 Change-Id: Ia768ad91ea0f5672b9c25a7ae4102d8d19de9570 Reviewed-by: Kari Hormi <kari.hormi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-09-14107-1033/+56442
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.11: aa8e21c Add new Qt3D demo ca03367 Exclude demos from colibri imx6ull a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo d7e9731 do not enable highdpiscaling on emulator f730907 Fix mediaplayer default video path 09aa32d Fix some major scaling & font issues on ebike-demo Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb
| * Add new Qt3D demoKimmo Ollila2018-09-1425-0/+53864
| | | | | | | | | | | | Change-Id: I3d83eb3687d64cb593416be8d033edaf3b3bec56 Task-number: QTBUG-62804 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * Exclude demos from colibri imx6ullSamuli Piippo2018-09-061-3/+3
| | | | | | | | | | | | | | | | | | Without GPU, colibri imx6ull cannot run all the demos. Exclude those from the launcher. Change-Id: I329a818d24a1f08551b68c115d9fffb18643c758 Task-number: QTBUG-70394 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * qtwebbrowser: merge changes from qtwebbrowser git repoSamuli Piippo2018-09-0644-490/+2216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/dev: Show settings on center of the screen Update url for engadget.com favicon Don't anchor to item that is part of a layout Doc: Switch to standard doc config and templates Install binaries into $$INSTALL_PREFIX Do not try to compile if the QtWebEngine is missing Add tests/tests.pro for the ci Fix missing override warning Update window title Fix build with Qt 5.7 Add documentation Update Copyright header Add GPLv3 license file Task-number: QTBUG-70390 Change-Id: I5233923302d6136d2fef28a9e446fdd592ad5d28 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * do not enable highdpiscaling on emulatorMikko Gronoff2018-08-312-4/+13
| | | | | | | | | | | | | | See QTBUG-64815 Change-Id: I73e0316fd78cbe260c3e22fe21801516bb62ae0c Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * Fix mediaplayer default video pathJuho Annunen2018-08-291-13/+9
| | | | | | | | | | | | | | Task-number: QTBUG-70198 Change-Id: If07b7e618e109893ab19cf1c7147c98e5ae8f17f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * Fix some major scaling & font issues on ebike-demoJuho Annunen2018-08-2937-523/+337
| | | | | | | | | | | | | | Task-number: QTBUG-69840 Change-Id: If519ae62a0a73c8dbf2f6f7b9f681bdfdb8b28a0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* | Doc: Bump version to 5.12.0Mikko Gronoff2018-08-282-6/+6
| | | | | | | | | | Change-Id: Ida891f88d36070063d9b5fb268d730e763df5d81 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devMikko Gronoff2018-08-24377-596/+22854
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.11: 1ff81b4 Merge remote-tracking branch 'origin/5.9' into 5.11 3594ea2 Fix scaling, video path & focusing issues on mediaplayer demo e81384c Remove confusing highlighting on media player file browser 4aa85d7 Use QSettings for color definitions a60eb67 Disable graphical effect from imx7 boards 83bffe9 Move color definitions to QSettings 57bc95f Fix qtquickcontrols2 demo image paths & controls theme a5ba671 Doc: Bump version to 5.11.2 1510d96 Doc: bump version to 5.9.7 cc9de37 Fix mediaplayer slider color definitions c20966f Move info button to mediaplayer-demo footer 0b0d77e Fix mediaplayer color definitions a607978 Update Boot2Qt Launcher demo icons & doc images 773a661 Disable webbrowser demo from all imx7 boards 9f18bb7 Doc: Bump version to 5.11.1 4fa8854 Doc: remove outdate doc folder under qtquickcontrols2 example 054a2ea doc: add missing doc images for e-bike & quickcontrols2 demo 173d934 Update Boot2Qt demos appearing in QtCreator a70868f Enable ebike demo 6ed3d30 Temporarily disable e-bike from the basicsuite demo set 28e9fdf Fix Media Player demo color definitions 6b5a6d0 Fix paths for demos.xml 783ca94 Doc: bump version to 5.9.6 d083365 Add new Ebike demo to basicsuite da60352 Move common definitions to shared settings e513aed Update QtWebBrowser demo to new UI theme f5c4c3a Remove qtwebbrowser submodule 3fa5796 Replace existing controls demos with controls 2 gallery example 04e4798 Update Mediaplayer demo to new UI theme 2e8942f Update GraphicalEffects demo to new UI theme e365074 Add new fonts 7c41444 Update Charts demo to new UI theme 2a50d49 Comment out 7 demos from demos.xml file 9e941af Doc: Bump version to 5.9.5 0909f9b Doc: Bump version to 5.11.0 55fee3b Doc: Bump version to 5.9.4 89033ce Doc: Bump version to 5.9.3 Change-Id: I17ac5f2e2ef94535458b07cf8db38688e25ca21c
| * Merge remote-tracking branch 'origin/5.9' into 5.11Mikko Gronoff2018-08-240-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.9: 1510d96 Doc: bump version to 5.9.7 783ca94 Doc: bump version to 5.9.6 9e941af Doc: Bump version to 5.9.5 55fee3b Doc: Bump version to 5.9.4 89033ce Doc: Bump version to 5.9.3 Merge without any actual changes, just to close a stray branch. Conflicts: doc/b2qt-demos.qdoc doc/b2qt-demos.qdocconf Change-Id: I6679aa3bba8e875c3fe17318d25cee18626aa830
| | * Doc: bump version to 5.9.7Mikko Gronoff2018-06-252-6/+6
| | | | | | | | | | | | | | | Change-Id: I52d7739b4eedbf523ae2e19b279266bc7b5cc2c6 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * Doc: bump version to 5.9.6Mikko Gronoff2018-05-092-7/+7
| | | | | | | | | | | | | | | Change-Id: I9a277b95784cb49f35da68f48433805bd584b6f5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| | * Doc: Bump version to 5.9.5Mikko Gronoff2018-03-062-6/+6
| | | | | | | | | | | | | | | Change-Id: Icc999332933b27a5a6c1c133045305a10f355eed Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * Doc: Bump version to 5.9.4Mikko Gronoff2017-12-202-6/+6
| | | | | | | | | | | | | | | Change-Id: I49cc18f9b613ddc0fe4de92945048dc8d0ba4a1b Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * Doc: Bump version to 5.9.3Mikko Gronoff2017-11-152-6/+6
| | | | | | | | | | | | | | | Change-Id: Ibb57b779b2b4608e6abd47e2fde973eb7f51e220 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Fix scaling, video path & focusing issues on mediaplayer demoJuho Annunen2018-08-238-44/+71
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: I8ea9bcc27fcf0b2d4fb9f7b8ada165f7a5a5d7c8 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Remove confusing highlighting on media player file browserJuho Annunen2018-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: Ic7e4db3278bf9df28f2d5cb0f1a4d0aa50aade2d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Use QSettings for color definitionsJuho Annunen2018-08-0228-94/+68
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-69536 Change-Id: I4c1fa7758db6f593dd38050a75d276fcc85346ac Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Disable graphical effect from imx7 boardsSamuli Piippo2018-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | GraphicalEffects require gpu which the imx7 boards do not have. ... also fix exclude filtering for webbrowser Change-Id: I0a14cbc1cec72a7b1e8f89bde22cb147bb2b7dbf Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Move color definitions to QSettingsJuho Annunen2018-07-191-0/+11
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-69536 Change-Id: Ib18f19ce57266393e8d1c8ae8e7322e73ccafa53 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
| * | Fix qtquickcontrols2 demo image paths & controls themeJuho Annunen2018-07-198-24/+27
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62805 Change-Id: I6cbd41384c003b1e29567af0c0c56341d5e93f6e Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 17:52:33 +0000