summaryrefslogtreecommitdiffstats
path: root/basicsuite
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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>
* 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-241-1/+1
| | | | | Change-Id: I7fd472387ee922f472d8ad330dbc18eda313ab74 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* 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>
* 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>
* 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>
* 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-134-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: 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>
* Update Boot2Qt demos appearing in QtCreatorMikko Gronoff2018-05-231-0/+0
| | | | | | | | | | | | | | 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-071-0/+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>
* Update GraphicalEffects demo to new UI themeJuho Annunen2018-05-041-21/+12
| | | | | | Task-number: QTBUG-62790 Change-Id: Ie4953d8ca1209ed382ad82f1db35c3b1a997dd1d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Add new fontsJuho Annunen2018-05-0414-1/+37
| | | | | | | Task-number: QTBUG-65302 Change-Id: I9ec2e7f5f904aa148aa29048ccbb84060e1bb3f1 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Update Charts demo to new UI themeJuho Annunen2018-05-0416-107/+228
| | | | | | Task-number: QTBUG-62792 Change-Id: I95c6fb038f5d427da2ed1ee6698e1afcfa436eee Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
* Comment out 7 demos from demos.xml fileJuho Annunen2018-05-041-0/+6
| | | | | | Task-number: QTBUG-62794 Change-Id: Ib3afd9df51b7adad359d80407566a24cee9e1366 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
* Disable camera demo for jetson-tx1Samuli Piippo2017-11-151-1/+1
| | | | | | Change-Id: I42ea53fbdbe045f75ee8b5b51ef12a2aa027eca0 Task-number: QTBUG-61714 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Fix issue where mediaplayer initially displays black videoSami Nurmenniemi2017-10-251-5/+9
| | | | | | | | | | If effectLoader.item has not been set before effectSource changes, setting effectLoader geography fails. There was a workaround where changing effect caused the video to display correctly. Task-number: QTBUG-63091 Change-Id: I726068f0860269d94507be5f92947caa6716efdf Reviewed-by: Kari Hormi <kari.hormi@qt.io>
* Fix typoMaurice Kalinowski2017-09-121-1/+1
| | | | | Change-Id: If772e4855b8ded33c3ca06207e3cfb38420e96af Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Mikko Gronoff2016-12-121-1/+1
|\ | | | | | | | | | | | | * origin/5.6: Remove wildcard in enterprise-gallery demo .pro file Change-Id: I64fe114bcb616f792bd02625cdf11ecdf6f9c093
| * Remove wildcard in enterprise-gallery demo .pro fileMikko Gronoff2016-12-121-1/+1
| | | | | | | | | | Change-Id: I5ff4496f0046bf6cb68545d20b108f7272fbf6f9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Mikko Gronoff2016-12-0813-26/+101
|\| | | | | | | | | | | | | * origin/5.6: Fixed demo .pro files: removed exclude.txt and wildcards used with content files Change-Id: I052c0f87dce2b5f8f7fc71647944e620fa6d0055
| * Fixed demo .pro files: removed exclude.txt and wildcards used with content filesKimmo Ollila2016-12-0813-26/+101
| | | | | | | | | | Change-Id: Id4731a6438c95ca9abca5e8477bd17228c55cfc7 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Update license headersKari Hormi2016-06-0774-638/+2815
| | | | | | | | | | | | | | - Update all license headers to commercial+BSD Change-Id: I7dbf9d967cde7dfe21bef255ea63652b42fccb71 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>