summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
| * | Doc: Bump version to 5.11.2Mikko Gronoff2018-06-282-6/+6
| | | | | | | | | | | | | | | Change-Id: I13ae5e9aed32e37aaa2f529d221c81506132046a Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Fix mediaplayer slider color definitionsJuho Annunen2018-06-182-3/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: I1d9547680adbed937ee3b5e413c9c2f76304af28 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
| * | Move info button to mediaplayer-demo footerJuho Annunen2018-06-182-13/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68674 Change-Id: I4e2c3dc499461dcbb9c4d6e8a03027d70419c160 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
| * | Fix mediaplayer color definitionsJuho Annunen2018-06-183-5/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68471 Change-Id: I292f40ce195f0e2f914353cb237e3009774c11bb Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Update Boot2Qt Launcher demo icons & doc imagesJuho Annunen2018-06-138-0/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68819 Change-Id: Idf1c1933765af2efc4e8193f5b03f99828cbc7b6 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Disable webbrowser demo from all imx7 boardsSamuli Piippo2018-05-311-1/+1
| | | | | | | | | | | | | | | Change-Id: I6acab41eddec0cc642b586dbb3e03b9334956893 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Doc: Bump version to 5.11.1Mikko Gronoff2018-05-252-6/+6
| | | | | | | | | | | | | | | Change-Id: I3cdbfee08f972a2082604cecc52a84e221ef83d5 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Doc: remove outdate doc folder under qtquickcontrols2 exampleTarja Sundqvist2018-05-244-61/+0
| | | | | | | | | | | | | | | | | | | | | | | | basicsuite/qtquickcontrol2 directory has /doc folder that seems to contain some outdated content that is not used at all. Change-Id: Ib11cf99f3f22c217b1c73b0470f6f6a43bf03346 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | doc: add missing doc images for e-bike & quickcontrols2 demoMikko Gronoff2018-05-242-0/+0
| | | | | | | | | | | | | | | Change-Id: I966708859b17d2f8ba613db12747bd55f508faff Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Update Boot2Qt demos appearing in QtCreatorMikko Gronoff2018-05-232-95/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New demos: E-Bike, Quick Controls 2 Gallery Removed demos: About B2Qt, Cinematic Demo, Camera, Data visualization, Canvas3D, Dashboard, Controls Gallery & Flat controls. Task-number: QTBUG-67917 Change-Id: I562737e7fd3e851e8a84cb3b71acc939a216032f Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | Enable ebike demoSami Nurmenniemi2018-05-2317-2/+1479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added datacollector, which is generates mock data to the demo. It needs to be configured to run as a service or manually started before running the demo. Without running datacollector, the demo does not show any changing data. Task-number: QTBUG-67917 Change-Id: Ia113b76b5eb024353051b93d9d518211ee2cd601 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Temporarily disable e-bike from the basicsuite demo setSami Nurmenniemi2018-05-211-0/+2
| | | | | | | | | | | | | | | Change-Id: Ia75480ce0624921683459cba68b1efaedbd61cfb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Fix Media Player demo color definitionsSami Nurmenniemi2018-05-186-8/+11
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: I2bd15e2e873aa7343a072b846918296e7cbce205 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Fix paths for demos.xmlSami Nurmenniemi2018-05-181-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-67917 Change-Id: Ibb1b64aaa110a62f2b28dee6fa21f3bc665e364f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * | Add new Ebike demo to basicsuiteJuho Annunen2018-05-07151-0/+13001
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-67917 Change-Id: I88e783ff7bcc530b13edfd3e21565953433293dc Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Move common definitions to shared settingsJuho Annunen2018-05-0732-76/+152
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65302 Change-Id: I2153e2f2b4aa295e87098256354ed034480294df Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Update QtWebBrowser demo to new UI themeJuho Annunen2018-05-0771-0/+4625
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62793 Change-Id: I8e1a0dcb229dc1b445a1b3a7787e6b818f246249 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Remove qtwebbrowser submoduleJuho Annunen2018-05-072-4/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62793 Change-Id: I3ef7323ebaed7b16014e139a5110f1784240520a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Replace existing controls demos with controls 2 gallery exampleJuho Annunen2018-05-0464-2/+3062
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62805 Change-Id: If63369430adffa875b0e96a148a03ab908a1dea2 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Update Mediaplayer demo to new UI themeJuho Annunen2018-05-0437-310/+300
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62791 Change-Id: Id7cb520669fc696cec65da591414b045fe45754a Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>