summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable' into releaseQtEE_v2.1.0Kalle Viironen2014-04-1564-887/+324
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable: (21 commits) Revert "Show PieMenu in enterprise controls list view." Show PieMenu in enterprise controls list view. Fix PieMenu not showing in enterprise-gallery launcher demo. Update enterprise controls demos to version 1.1 Revert "Add input field for decimal numbers" Doc: Update documentation version to 2.1.0 [launchersettings] Fix UI scaling [about-b2qt] Use Screen element for setting width/height Change default font for demos to support arabic numbers [launchersettings] Small fixes in wifi settings section sensorexplorer: Use identifier field when description is empty Make sensors demo not rely on measurement errors Doc: Update screenshot for the textinput demo Remove incorrect assingment of QUrl to bool qt5-everywhere: update working radio playlist Show launchersettings and sensors demos in QtCreator Doc: Switch to use the global Qt template for example docs Updated preview_l.jpg for textinput demo Rearrange the order of demos in the launcher Merge updates from upstream into keyboard example ... Change-Id: I83f65cb50cf53609d9bb131c94c3d020882a2ccd
| * Revert "Show PieMenu in enterprise controls list view."Rainer Keller2014-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | The PieMenu does not handle screen rotation properly. Thus it will be removed from the demo right now. This reverts commit 846728c8a3f7681dc56d52bb3859a82130c84cc8. Change-Id: Ie8e7f30761a6da403b7ad4de16d4594c95c16163 Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
| * Show PieMenu in enterprise controls list view.Gatis Paeglis2014-04-111-3/+3
| | | | | | | | | | Change-Id: I022ef68df7a5e5635717679e3cf7447b75a62d9a Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
| * Fix PieMenu not showing in enterprise-gallery launcher demo.Mitch Curtis2014-04-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the root item doesn't get the correct size - or any size for that matter - so it is never visible. The fix for this is already in Qt 5.3 (see QTBUG-36938), but we can still work around it for earlier versions with this fix. Task-number: QTRD-3040 Change-Id: I38a5f793cf1cc07a758d9118c31bc3177a75da54 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * Update enterprise controls demos to version 1.1Gatis Paeglis2014-04-1020-109/+192
| | | | | | | | | | | | Task-number: QTEE-482 Change-Id: I79f665de133cbe1c77962a8d93acdddd2e05fcc1 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
| * Revert "Add input field for decimal numbers"Rainer Keller2014-04-101-12/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit b6c311a039f520cf9a681708a5d94d2034b4b1a9. Numeric input does not work due to QTRD-2945. Task-number: QTEE-485 Change-Id: Ie7ab6860dbaf65b6105e7dbd722a557b15c3e08b Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
| * Doc: Update documentation version to 2.1.0Topi Reinio2014-04-101-2/+2
| | | | | | | | | | Change-Id: Ia4ec89fa954c1c3fd94b45d607739d2cfd49745d Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
| * [launchersettings] Fix UI scalingGatis Paeglis2014-04-091-2/+5
| | | | | | | | | | | | Task-number: QTEE-473 Change-Id: I8fb07fd007c394beec1603cdf171e0af15af0819 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * [about-b2qt] Use Screen element for setting width/heightGatis Paeglis2014-04-091-2/+3
| | | | | | | | | | | | Task-number: QTRD-3032 Change-Id: Ifdd27fe756f120bcb78093626908b04a62065d3a Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Change default font for demos to support arabic numbersPasi Petäjäjärvi2014-04-081-2/+2
| | | | | | | | | | | | | | | | | | Demos itself did use the wrong font when virtualkeyboard used the correct one. Task-number: QTEE-354 Change-Id: I987b7b6d9c1132c906b6283951bbe46d38237a3d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * [launchersettings] Small fixes in wifi settings sectionGatis Paeglis2014-04-071-33/+40
| | | | | | | | | | | | | | | | - only one list section expanded at a time. - adjust example to the changes in QtWifi API. Change-Id: I08eed885e08f581302f2704e07a0218c95c7454e Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * sensorexplorer: Use identifier field when description is emptySamuli Piippo2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | Dummy sensors do not have description set, so they show up empty in the sensorexplorer. Use identifier in those cases. Task-number: QTEE-245 Change-Id: Iad160ddccde12124e1c293bb9894870ca4ab7ab9 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * Make sensors demo not rely on measurement errorsRainer Keller2014-04-021-21/+43
| | | | | | | | | | | | | | | | | | | | | | The former implementation only updates the bubble when notified by a sensor changed event. This is not optimal because when the accelerometer is kept at a constant tilt the value does not change anymore but the bubble has to move further nevertheless. Change-Id: I24793b4c8da3fdc75eb3054acd88976d053149e3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Doc: Update screenshot for the textinput demoTopi Reinio2014-04-011-0/+0
| | | | | | | | | | | | | | | | Reuse the updated launcher image from 818bc14e. Task-number: QTEE-460 Change-Id: I7a2b5415a0af2f04412200a69c719ddda975958e Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com>
| * Remove incorrect assingment of QUrl to boolPasi Petäjäjärvi2014-04-011-2/+0
| | | | | | | | | | | | Task-number: QTEE-403 Change-Id: Idd20f43546e133473da54fdad804d23254fd4ba2 Reviewed-by: Rainer Keller <rainer.keller@digia.com>
| * qt5-everywhere: update working radio playlistSamuli Piippo2014-03-271-5/+1
| | | | | | | | | | | | | | | | | | List is actually read from qt-project.org, so need to update it there as well. Task-number: QTEE-398 Change-Id: I9dcbda1f3dcb1c6cd8e63434d17289d0e029a1b4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Show launchersettings and sensors demos in QtCreatorGatis Paeglis2014-03-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | These examples are working out-of-the box when deployed as stand alone applications. Sensors demo required 8e600f9540ec1bbbda97ef5f182c275cc437b6d2. Task-number: QTEE-412 Change-Id: Id5f48cb5822f12f64d738b9623725f7995f6d884 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * Doc: Switch to use the global Qt template for example docsTopi Reinio2014-03-1812-672/+8
| | | | | | | | | | | | | | | | | | | | Switch to use the global Qt documentation template, remove local copy of the template, and clean up the documentation configuration. Task-number: QTEE-392 Change-Id: Ib026725696aa1302572558f73ea89f683867939c Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * Updated preview_l.jpg for textinput demoPasi Petäjäjärvi2014-03-141-0/+0
| | | | | | | | | | | | Task-number: QTEE-424 Change-Id: I4d23e42d5097386e55666f655b9b6566277ccf4b Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Rearrange the order of demos in the launcherTopi Reinio2014-03-1317-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The launcher will sort the demos alphabetically based on their titles, and then removes leading digits (see cf9b6d17). This allows us to control the order of the demos. This change sets the following order, from left to right: About Qt Enterprise Embedded Launcher Settings Qt5 Everywhere Qt5 Cinematic Demo Qt5 Launch Presentation Virtual Keyboard Qt Quick Enterprise Controls - Dashboard Qt Quick Enterprise Controls - Gallery Controls: Touch Qt Charts - Gallery Media Player Camera Photo Gallery Graphical Effects Sensors Demo Change-Id: I80e5fb66b55f5b5541acc70410c555d4d971e220 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Merge updates from upstream into keyboard exampleRainer Keller2014-02-264-17/+3
| | | | | | | | | | Change-Id: I0b48f285e63f88788ca6015a1d7a53edaccd35b8 Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
| * Add input field for decimal numbersRainer Keller2014-02-261-2/+13
| | | | | | | | | | Change-Id: Ie0331e7152b992c79708da66d77371558ceaf1cf Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
| * Merge branch 'release' into stableKalle Viironen2014-02-255-4/+40
| |\ | |/ |/| | | | | | | | | | | | | * release: Fix typo Main -> SharedMain Fix stand alone demo layout issues on portrait devices Exclude mediaplayer also from eLinux-bone, since not working Change-Id: I25ec98b4c3380155230a5381b4146e71da124de5
* | Fix typo Main -> SharedMainQtEE_v2.0.0Gatis Paeglis2014-02-241-1/+1
| | | | | | | | | | Change-Id: I0b5929e42631f08e864b3642373b63f7b7ae62cc Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
* | Fix stand alone demo layout issues on portrait devicesGatis Paeglis2014-02-214-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | B2Qt demos are designed for landscape view, nexus by default is a portrait device, so we have to rotate demos by 90 degrees to show them in portrait view on nexus. This matches the implementation from b2qt-launcher. Task-number: QTEE-432 Change-Id: Id063dc4a3ff97d86a3a02cb62f1066882316208f Reviewed-by: Rainer Keller <rainer.keller@digia.com>
* | Exclude mediaplayer also from eLinux-bone, since not workingaavit2014-02-211-0/+1
| | | | | | | | | | Change-Id: Ida0fb9c0e1a8186d8a0437074882d27b000a8ab3 Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
* | Merge branch 'stable' into releaseKalle Viironen2014-02-211206-18361/+27337
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable: (50 commits) Fix deployment of QML import plugins when building in Qt Creator Add QtWidgets dependecy to shared.pri Update title and description for Text Input demo Update content for About Boot to Qt demo Fix QML GroupBox: Binding loop detected for property [controls-touch] Deploy images Remove Sensors demo from the Qt Creator's list of examples Remove Sensor Explorer and Particles demos from launcher Fix layout issues with Qt-Everywhere (touchgallery) [qt5-launchpresentation] Don't crop the description text on nexus [launcher settings] improve visual appearance [qt5-everywhere] update preview image Fix vkb import path Fix issues in qt5-launcher presentation Remove Raspberry Pi logo from demo Fix Canvas2D error Qt5-Everywhere: show network error message fix glsl syntax in graphical effects demo Update copyright year Limit camera & mediaplayer demos to working devices ... Change-Id: I1ed9233a89ea989013b398c8480e1932949fff19
| * Fix deployment of QML import plugins when building in Qt CreatorTopi Reinio2014-02-203-11/+26
| | | | | | | | | | | | | | | | Task-number: QTEE-419 Task-number: QTEE-420 Change-Id: Iaa57cf0b4060f1dfb3fad3e81bc4c4d070cc6820 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
| * Add QtWidgets dependecy to shared.priGatis Paeglis2014-02-202-4/+6
| | | | | | | | | | | | | | | | Task-number: QTEE-417 Change-Id: I927a6ac2bfe4fbce4819bd740f4a7d1df19466ac Reviewed-by: Kalle Viironen <kalle.viironen@digia.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Update title and description for Text Input demoTopi Reinio2014-02-202-2/+2
| | | | | | | | | | | | | | | | Rename to 'Virtual Keyboard' and use 'Qt Enterprise Embedded' in the description. Change-Id: Id98b83d2be41d51acf279ee3d357603bfe99295a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Update content for About Boot to Qt demoTopi Reinio2014-02-205-34/+45
| | | | | | | | | | | | | | | | | | | | | | - Replace Boot to Qt with Qt Enterprise Embedded where suitable, and update content with current messaging - Rename title to 'About Qt Enterprise Embedded' Task-number: QTEE-390 Change-Id: I30c2ee11954da43dc4010cc890beec9020cc529f Reviewed-by: Kalle Viironen <kalle.viironen@digia.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Fix QML GroupBox: Binding loop detected for propertyAndy Nichols2014-02-201-0/+3
| | | | | | | | | | | | | | | | QTEE-357 Change-Id: I8f400f5d204f56e61339e097d6288961d3d7133d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * [controls-touch] Deploy imagesGatis Paeglis2014-02-201-2/+4
| | | | | | | | | | | | Task-number: QTEE-418 Change-Id: I11b84680f2e93df27da601b5948336640428d4a1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Remove Sensors demo from the Qt Creator's list of examplesTopi Reinio2014-02-201-0/+2
| | | | | | | | | | | | | | | | This demo doesn't work when built stand-alone. Task-number: QTEE-422 Change-Id: Ib5f85f5322e79c8fdf4221f804d9a0147e906740 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * Remove Sensor Explorer and Particles demos from launcherTopi Reinio2014-02-202-1/+2
| | | | | | | | | | | | | | | | | | Remove the two demos from the launcher. Keep them in the repository still, making it possible to build them stand-alone. Change-Id: I00fc2e91d556584a9a1124ccc8598ec65804bacb Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * Fix layout issues with Qt-Everywhere (touchgallery)Andy Nichols2014-02-197-9/+12
| | | | | | | | | | Change-Id: I852d90b1c6afdc0316c7d4e45415c53eda94066a Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| * [qt5-launchpresentation] Don't crop the description text on nexusGatis Paeglis2014-02-191-4/+3
| | | | | | | | | | | | | | Tesk-number: QTEE-407 Change-Id: I6f89136ceece1e6aae1c6b00c3b2aa53c47c1e4c Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * [launcher settings] improve visual appearanceGatis Paeglis2014-02-198-97/+137
| | | | | | | | | | | | | | and fix the UI shrinking issue when vkb is visible. Change-Id: I8609dbc4a852b04e3ed9f3fbd3eb1175f3576f5e Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * [qt5-everywhere] update preview imageGatis Paeglis2014-02-191-0/+0
| | | | | | | | | | | | | | | | Updated preview image to show clouds with open applications. This way it looks less boring and matches screenshot from Android store. Change-Id: I2669d6afaa98fd20e20d8bd30d6f2129d3e8b870 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Fix vkb import pathGatis Paeglis2014-02-181-1/+2
| | | | | | | | | | | | | | Task-number: QTEE-391 Change-Id: I14b1d6ad883bb62bcfd0ec44d083e95b7c4932cd Reviewed-by: Rainer Keller <rainer.keller@digia.com>
| * Fix issues in qt5-launcher presentationAndy Nichols2014-02-143-3/+4
| | | | | | | | | | | | | | | | | | No warnings on start Using a valid fontfamily for Context2D example velocityfrommotion particle demo is now visible Change-Id: Ibc805d32f55950279918935d1711f61afe0d7308 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Remove Raspberry Pi logo from demoAndy Nichols2014-02-142-0/+0
| | | | | | | | | | | | | | | | | | This demo was designed to be run the raspberry pi but we run it on all kinds of devices so I've removed the logo. Change-Id: I72e0101b0cd2c331436037099c8142a0f3780dc7 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Fix Canvas2D errorAndy Nichols2014-02-141-1/+1
| | | | | | | | | | | | | | | | The numbers on the clock were being rendered wrong because of an invalid Context2D font family. Change-Id: I74d3ce15ccfba77dae4997874f940b5d1fff34a9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Qt5-Everywhere: show network error messageAndy Nichols2014-02-144-0/+93
| | | | | | | | | | | | | | | | | | | | | | Instead of showing broken applications when there is no available network, we now show an error message indicating that there is no network available. This is neat because now we dont have to let customers know why things are working at shows, and people trying this for themselves will know what they need to do to remedy the issue. Change-Id: Idda904946fb823abce3f8f11c51b5516cb58472c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * fix glsl syntax in graphical effects demoaavit2014-02-131-1/+1
| | | | | | | | | | | | | | On BBB/eLinux, the Dissolve effect would fail to compile at runtime. Change-Id: Ib9c1383d1543dd8c759634b79eabe4489d7b4868 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * Update copyright yearaavit2014-02-12206-206/+206
| | | | | | | | | | Change-Id: I55381dedffc4d86bc25b0c3f6ef18230d70272ee Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Limit camera & mediaplayer demos to working devicesaavit2014-02-122-2/+10
| | | | | | | | | | Change-Id: I81d3f3a7e142eb0f5f0fef251de7daa9a3f7a7a9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Fix license issues in demo sourcesTopi Reinio2014-02-126-32/+37
| | | | | | | | | | Change-Id: I6c87139bb729f2970ae22d7ef92688de647f8e3c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Doc: Add documentation for enterprise examplesTopi Reinio2014-02-077-0/+73
| | | | | | | | | | | | | | | | Add documentation for enterprise examples and make them run stand-alone. Change-Id: I579a57bd32c97649b6d619f73caa681174b56381 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
| * Exclude sensor demos from devices that don't have sensorsSamuli Piippo2014-02-072-0/+2
| | | | | | | | | | | | | | | | Sensor demos make sense only on devices that have sensors, i.e., emulators and nexus7. Change-Id: I3c49cce9675a0e37e3b20f73b61fcd71e1b5baf9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>