summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Samuli Piippo2016-08-260-0/+0
|\ \ | |/ | | | | | | | | | | * origin/5.6: Update qtwebbrowser submodule url. Change-Id: I94f8090403597215c433447fa4f8184055ee412a
| * Update qtwebbrowser submodule url.Gatis Paeglis2016-06-141-1/+1
| | | | | | | | | | | | | | (cherry picked from commit cd9f0c40f30226c7ce1c3259aea8ebca08acfbb8) Change-Id: I3ce5233864f85923be007c2d99f6d07b14b0d426 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | Update qtwebbrowser submodule url.Gatis Paeglis2016-06-131-1/+1
| | | | | | | | | | Change-Id: I7d4f81ee778e2254bda5ccbf78b6ea0de96bb2d5 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | Doc: Bump version to 5.7.0Topi Reinio2016-06-092-6/+6
| | | | | | | | | | | | Task-number: QTBUG-53889 Change-Id: I90e21aa6897643d4a4b9c84c61673e49f5e488cb Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Update license headersKari Hormi2016-06-0787-826/+3285
| | | | | | | | | | | | | | - Update all license headers to commercial+BSD Change-Id: I7dbf9d967cde7dfe21bef255ea63652b42fccb71 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* | Replaced SettingsUI import uriKimmo Ollila2016-06-021-1/+1
| | | | | | | | | | Change-Id: I872171494c19a70e1e6ab094ce5b32c7368b693e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Use new import path for QtVirtualKeyboardSamuli Piippo2016-06-015-6/+6
| | | | | | | | | | Change-Id: Ib520fdfe33d4ca5db35d718041e796e10c9ebb0a Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* | Replace LauncherSettings with SettingsUI from Device Utils module.Kimmo Ollila2016-05-1316-745/+4
| | | | | | | | | | | | Change-Id: I6c50cab59db04dc9837a13f88124202973ce40c7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | Update license headersTopi Reinio2016-05-03128-1327/+1676
| | | | | | | | | | | | | | | | | | - Update Copyright year and holder, unify license text formatting - Update BSD, LGPL licenses for files originating from Qt repositories Change-Id: Id77f62f754c3bb29bb4b1c816e3f984a087ee87e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Remove strings 'Digia' and 'Enterprise Embedded' from examplesTopi Reinio2016-05-032-2/+2
| | | | | | | | | | | | Change-Id: I5ad8723335f6ef34e674c98a6b82d1881ae8e388 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Add support for Raspberry Pi 3Tuomas Heimonen2016-04-141-2/+2
| | | | | | | | | | Change-Id: I5d32392a3d713f01554973a873e5d8d1b94be70c Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSamuli Piippo2016-04-0613-50/+70
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * origin/5.6: Doc: Language fixes for the demo descriptions Exclude planets demo on emulator democompositor: make demo deployable New icons qtwebbrowser: add pro file to create stand-alone application Remove android from exclude list Exclude canvas3d planets demo from RPi2 Change-Id: Ia84a23bb9daf45d239e4e65e342083fe410303ae
| * Doc: Language fixes for the demo descriptionsTopi Reinio2016-03-141-7/+7
| | | | | | | | | | | | | | | | | | - Replace mention of 'Enterprise Embedded' -> Qt DC - No need to mention 'Qt Quick 2.0' as a new feature anymore. Change-Id: Iefe871b68afee70d950703a2befb77f26a63f761 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
| * Exclude planets demo on emulatorSamuli Piippo2016-03-141-1/+1
| | | | | | | | | | | | Change-Id: I2f260c5ee8dadb466d7545ee37572a05191c0e54 Task-number: QTEE-1084 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
| * democompositor: make demo deployableSamuli Piippo2016-03-111-0/+2
| | | | | | | | | | Change-Id: Ief1e7f2a46a4f873b3328d9616e30b50bfaad2f1 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
| * New iconsPaul Olav Tvete2016-03-117-10/+8
| | | | | | | | | | Change-Id: Ibb6c7c52dc9004268fc4ff501fc5a38b25743d25 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
| * qtwebbrowser: add pro file to create stand-alone applicationSamuli Piippo2016-03-094-28/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | Current pro file only creates the qml plugin needed to run QtWebBrowser demo from the qtlauncher. Add separate pro file for creating the application that can be deployed and launched from QtCreator. Additionally use the resource file from tqtc-qtwebbrowser, so we can use the qml files from the qml plugin instead of filesystem. Task-number: QTEE-1083 Change-Id: I700824fc82d70c40379a4e97513b7e3947be6fdd Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
| * Remove android from exclude listSamuli Piippo2016-03-011-5/+5
| | | | | | | | | | | | | | Android is no longer supported. Change-Id: I7bf7d5f095d61932a2cfa85f1a8ec5952b80ae6d Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
| * Exclude canvas3d planets demo from RPi2Samuli Piippo2016-03-011-1/+1
| | | | | | | | | | | | Change-Id: I4e1c4662af1d66dd4aad760cc22fc3a5ca8f090d Task-number: QTBUG-51566 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSamuli Piippo2016-02-2512-73/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * origin/5.6: change button background color from white to black change about-b2qt background to white doc: update demos used in docs export wayland demo Update qtwebbrowser submodule to fix keyboard issue Added audio formats to mediaplayer's file filters. Replace title, description and exclude files with one demos.xml Change-Id: Ia7a617e728e25c53ab112c4e3dec0bac1996af42
| * change button background color from white to blackKatja Marttila2016-02-251-2/+2
| | | | | | | | | | | | Change-Id: I201e86316a1678d15008a994a0c79687c410b752 Task-number: QTEE-1069 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
| * change about-b2qt background to whiteKatja Marttila2016-02-231-2/+2
| | | | | | | | | | | | | | | | text is not seen with black background Change-Id: I1638a808564b32b6343901703fd16e06365bd297 Task-number: QTEE-1067 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
| * doc: update demos used in docsSamuli Piippo2016-02-1710-73/+19
| | | | | | | | | | | | | | | | Remove demos no longer used and add new ones. Demos are now installed to Demos/B2Qt-5.6/basicsuite. Change-Id: I2ebe4fac44631a776c27e849109c0c2eb24026ab Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
| * Merge remote-tracking branch 'origin/dev' into 5.6Samuli Piippo2016-02-1517-90/+282
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * origin/dev: Add missing quit.png Initial implementation of Diana's design Fade to black Change-Id: Ic9ea6a2de9490999f276b63b64dd5e723709e7e3
| * | export wayland demoSamuli Piippo2016-02-151-0/+1
| | | | | | | | | | | | | | | Change-Id: I7d27c72b6b98853733fa53b50f48a90c071bbf69 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| * | Update qtwebbrowser submodule to fix keyboard issueMichal Klocek2016-02-121-0/+0
| | | | | | | | | | | | | | | | | | Task-number: QTEE-1066 Change-Id: I25256035508055edf8a8e5f43cfd91c6ea45ab76 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
| * | Added audio formats to mediaplayer's file filters.Kimmo Ollila2016-02-041-1/+4
| | | | | | | | | | | | | | | Change-Id: I808b37280fa7540cdb9120e28278913c152d5019 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
| * | Replace title, description and exclude files with one demos.xmlKimmo Ollila2016-01-2731-68/+90
| | | | | | | | | | | | | | | Change-Id: Ice4d810389ebf186cdfced3964c3a1c7e12e1ead Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | | change button background color from white to blackKatja Marttila2016-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: I201e86316a1678d15008a994a0c79687c410b752 Task-number: QTEE-1069 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* | | Added audio formats to mediaplayer's file filters.Kimmo Ollila2016-02-231-1/+4
| | | | | | | | | | | | | | | Change-Id: I5b42a37e034b58d03a809b8442f20562404bfbe0 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | | change about-b2qt background to whiteKatja Marttila2016-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | text is not seen with black background Change-Id: I1638a808564b32b6343901703fd16e06365bd297 Task-number: QTEE-1067 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* | | Replace title, description and exclude files with one demos.xmlKimmo Ollila2016-02-1931-68/+90
| |/ |/| | | | | | | Change-Id: If6ea447d8613c73bdbe926a567efa3de6f9422fc Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* | Add missing quit.pngPaul Olav Tvete2016-02-151-0/+0
| | | | | | | | | | Change-Id: I78bf35e4d9ba5d315e5103db912a476b8ea61647 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Initial implementation of Diana's designPaul Olav Tvete2016-02-0916-88/+250
| | | | | | | | | | | | | | | | Based on the screenshots. Not using exact values for sizes and distances. Change-Id: I37c9593b776f4fb6f98ab4b8b571357f182ee65a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Fade to blackPaul Olav Tvete2016-02-092-5/+35
|/ | | | | Change-Id: Ib8cb64c1c3d84bf79e70bab3c353519f7daadd92 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Don't try to build removed sensor demoSamuli Piippo2016-01-261-2/+0
| | | | | Change-Id: I154e37e267c8a0ee03f48cb5918ca2e2baaa69e2 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* Updated screenshot of Flat Style controls demoKimmo Ollila2016-01-251-0/+0
| | | | | | Change-Id: I15d4e2dd2b5d1810cde85b2932ec145f40390bb0 Task-Id: QTRD-3779 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* delete unnecessary demosKatja Marttila2016-01-22159-9467/+0
| | | | | | Change-Id: I9b325faabc80a65283f005e5bae3be29fdecccab Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* Remove old webengine and settingsviewKatja Marttila2016-01-212-6/+2
| | | | | | | | Webengine is replaced with webbrowser and settingsview is accessed through settings button Change-Id: Idf8d60c11579a57ec8181ca23e386a543f24cce3 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* Use WifiManager.lastError for error reportingGatis Paeglis2016-01-202-4/+25
| | | | | Change-Id: Ia5e267bd631ada61703c7be5e295665be48c1410 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* Removed wrong default text from wifiOnOffButtonKimmo Ollila2016-01-201-1/+0
| | | | | Change-Id: Ia78513f9ce8972f030082c3c8f704a05272584f7 Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
* add browser demoKatja Marttila2016-01-1911-0/+133
| | | | | | | | | qtwebbrowser will be imported as submodule Change-Id: Iebbc9a66bcb74d730b1fb4ef7ed5938fc7e67542 Task-Id: QTRD-3794 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* Renewed filebrowser part of mediaplayer demoKimmo Ollila2016-01-194-285/+142
| | | | | | Change-Id: Idbb910caecde8e7d33035bf3c5462a6fbc0c544c Task-number: QTRD-3783 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* Improve qt datavis demoKatja Marttila2016-01-182-11/+9
| | | | | | | | | For now just minor changes, plan is to replace the buttons with more fancy stuff Change-Id: I32a8a17326cd52dc0927cb4f9e3a25ab65311b56 Task-number: QTRD-3782 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into dev" into devTopi Reiniƶ2016-01-180-0/+0
|\
| * Merge remote-tracking branch 'origin/5.5' into devSamuli Piippo2016-01-150-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.5: Doc: Bump version to 5.5.1 Conflicts: doc/b2qt-demos.qdocconf Change-Id: I5121d0506fe2ce3990be457bb4dbd28252676311