summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13HEADdevMikko Gronoff2019-02-064-0/+6
|\
| * Doc: Bump version to 5.12.2Mikko Gronoff2019-02-062-7/+7
| * Enable boot2qt launcher automatic demo modeSami Nurmenniemi2019-02-044-0/+6
* | Doc: Bump version to 5.13.0Mikko Gronoff2019-02-042-7/+7
|/
* Doc: Bump version to 5.12.1Mikko Gronoff2018-12-102-6/+6
* Revert "emulator: exclude e-bike demo from launcher"Mikko Gronoff2018-12-101-1/+1
* Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-12-100-0/+0
|\
| * Doc: Bump version to 5.11.35.11Mikko Gronoff2018-11-272-6/+6
* | emulator: exclude e-bike demo from launcherMikko Gronoff2018-11-191-1/+1
* | ebike: use Moment.js correctlySamuli Piippo2018-11-141-1/+1
* | ebike: use Moment.js correctlySamuli Piippo2018-11-131-1/+1
* | SensorTag: Fix qml warningMaurice Kalinowski2018-11-051-3/+3
* | SensorTag: Update QML filesMaurice Kalinowski2018-10-312-2/+1
* | SensorTag: Fix warnings and cleanupMaurice Kalinowski2018-10-255-38/+44
* | SensorTag: Prefer loading MQTT configuration from fileMaurice Kalinowski2018-10-254-15/+79
* | qt3D demo: remove advanced custom materials demo from launcherMikko Gronoff2018-10-041-0/+2
* | Qt3D demo: Add doc image & fix resource pathsMikko Gronoff2018-09-242-1/+1
* | Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-09-211-2/+15
|\ \ | |/
| * Use Material style only on devices with gpuSami Nurmenniemi2018-09-211-2/+15
* | Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-09-14107-1033/+56442
|\ \ | |/
| * Add new Qt3D demoKimmo Ollila2018-09-1425-0/+53864
| * Exclude demos from colibri imx6ullSamuli Piippo2018-09-061-3/+3
| * qtwebbrowser: merge changes from qtwebbrowser git repoSamuli Piippo2018-09-0644-490/+2216
| * do not enable highdpiscaling on emulatorMikko Gronoff2018-08-312-4/+13
| * Fix mediaplayer default video pathJuho Annunen2018-08-291-13/+9
| * Fix some major scaling & font issues on ebike-demoJuho Annunen2018-08-2937-523/+337
* | Doc: Bump version to 5.12.0Mikko Gronoff2018-08-282-6/+6
* | Merge remote-tracking branch 'origin/5.11' into devMikko Gronoff2018-08-24377-596/+22854
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.9' into 5.11Mikko Gronoff2018-08-240-0/+0
| |\
| | * Doc: bump version to 5.9.7Mikko Gronoff2018-06-252-6/+6
| | * Doc: bump version to 5.9.6Mikko Gronoff2018-05-092-7/+7
| | * Doc: Bump version to 5.9.5Mikko Gronoff2018-03-062-6/+6
| | * Doc: Bump version to 5.9.4Mikko Gronoff2017-12-202-6/+6
| | * Doc: Bump version to 5.9.3Mikko Gronoff2017-11-152-6/+6
| * | Fix scaling, video path & focusing issues on mediaplayer demoJuho Annunen2018-08-238-44/+71
| * | Remove confusing highlighting on media player file browserJuho Annunen2018-08-061-1/+1
| * | Use QSettings for color definitionsJuho Annunen2018-08-0228-94/+68
| * | Disable graphical effect from imx7 boardsSamuli Piippo2018-08-021-2/+2
| * | Move color definitions to QSettingsJuho Annunen2018-07-191-0/+11
| * | Fix qtquickcontrols2 demo image paths & controls themeJuho Annunen2018-07-198-24/+27
| * | Doc: Bump version to 5.11.2Mikko Gronoff2018-06-282-6/+6
| * | Fix mediaplayer slider color definitionsJuho Annunen2018-06-182-3/+4
| * | Move info button to mediaplayer-demo footerJuho Annunen2018-06-182-13/+10
| * | Fix mediaplayer color definitionsJuho Annunen2018-06-183-5/+6
| * | Update Boot2Qt Launcher demo icons & doc imagesJuho Annunen2018-06-138-0/+0
| * | Disable webbrowser demo from all imx7 boardsSamuli Piippo2018-05-311-1/+1
| * | Doc: Bump version to 5.11.1Mikko Gronoff2018-05-252-6/+6
| * | Doc: remove outdate doc folder under qtquickcontrols2 exampleTarja Sundqvist2018-05-244-61/+0
| * | doc: add missing doc images for e-bike & quickcontrols2 demoMikko Gronoff2018-05-242-0/+0
| * | Update Boot2Qt demos appearing in QtCreatorMikko Gronoff2018-05-232-95/+16