summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Bump version to 5.11.35.11Mikko Gronoff2018-11-272-6/+6
| | | | | Change-Id: I21a7d3fec0e5161d0c173e347f28f369b9375a71 Reviewed-by: Samuli Piippo <samuli.piippo@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>
* 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>
* | 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>
* | Doc: Bump version to 5.11.0Mikko Gronoff2018-02-192-6/+6
| | | | | | | | | | | | Task-number: QTBUG-66307 Change-Id: Ica4191efa5adf0396d0be0ac980e583734d0045c Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2018-02-127-8/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: Doc: Bump version to 5.10.1 iot-sensortag: Add an About tab iot-sensortag: Fix build against 5.10.0 iot-sensortag: Create a quit button SmartWatch demo Change-Id: I247db054b05cb481c67b08cd42fb762f5539460c
| * | Doc: Bump version to 5.10.15.10Mikko Gronoff2018-01-252-7/+7
| | | | | | | | | | | | | | | Change-Id: I5e2c5e2003744f1e46a38953720316cdc0da6e66 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * | iot-sensortag: Add an About tabMaurice Kalinowski2017-12-183-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the watch UI it is helpful to provide an About to visualize it is a Qt application. Change-Id: I83779c038dcaac12ca873b53f4d82d0e801233f2 Reviewed-by: Andrew O'Doherty <andrew.odoherty@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | iot-sensortag: Fix build against 5.10.0Maurice Kalinowski2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before the final release the Qt Mqtt API has been updated. Change-Id: I6f9e3e9cc5db16fe87d3493f12703194e9f14654 Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | iot-sensortag: Create a quit button SmartWatch demoAndrew O'Doherty2017-11-232-0/+14
| | | | | | | | | | | | | | | | | | | | | SmartWatch demo requires a button to exit the application Change-Id: I64f366d70960e868bcf9f4c644f81a145edd44b6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 20:53:45 +0000