summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers & remove obsolete strings5.6Mikko Gronoff2017-09-18151-1586/+4394
| | | | | | | | | | | | | | | | - Update Copyright year and holder, unify license text formatting - Update BSD, LGPL licenses for files originating from Qt repositories - Remove strings 'Digia' and 'Enterprise Embedded' from examples - Update all license headers to commercial+BSD (Cherry-picked from commits: c5f8197bd3a4fef592f6b78e2e2b1dba17bd8d99 307b6bec8b73f780a14b13f8dccf0f2cb79bc63c a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e) Change-Id: I47096d55a9f7c6cac2136a8594faa6af8811412e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update version numbers for Qt 5.6.3Tarja Sundqvist2017-08-232-6/+6
| | | | | Change-Id: Ic2e7a104536c23d7655ee707afbeb54616d088cc Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Remove wildcard in enterprise-gallery demo .pro fileMikko Gronoff2016-12-121-1/+1
| | | | | Change-Id: I5ff4496f0046bf6cb68545d20b108f7272fbf6f9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* 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 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>
* 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>
* 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
| * 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>
* | 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>
* 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
| | * Doc: Bump version to 5.5.15.5Topi Reinio2015-09-151-2/+2
| | | | | | | | | | | | | | | Change-Id: I93448549ea07ea85f0f8f044ee54c14cb3d9cf3e Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | | Update video url which mediaplayer is playing in startupKatja Marttila2016-01-151-1/+1
|/ / | | | | | | | | Change-Id: I1ab5a0d98550bd2cc6f7b15aae31365d789b4c2c Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | Use example from VKB2.0Katja Marttila2016-01-145-298/+193
| | | | | | | | | | | | Task-Id: QTRD-3778 Change-Id: I3bcb850dfd42068b0419b6b143a962a6f7214121 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* | Removed demo videosKatja Marttila2016-01-143-0/+0
| | | | | | | | | | | | | | | | Videos are loaded to image from web Change-Id: I4408a393146274a93137d9c3335f98d83df74788 Task-number: QTRD-3786 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | Doc: Update copyright footerTopi Reinio2016-01-141-5/+4
| | | | | | | | | | | | | | Update copyright holder to The Qt Company, and copyright year to 2016. Change-Id: I5bfb5044990ea2047ed113a7e7e21c5f9e4a960e Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | Renewed Launcher SettingsKimmo Ollila2016-01-1419-680/+488
| | | | | | | | | | | | Task-number: QTRD-3776 Change-Id: I69bc4f0bb1628feb73b4acc35908950095eb4515 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* | Doc: Bump version to 5.6.0Topi Reinio2016-01-132-6/+6
| | | | | | | | | | Change-Id: Ibc6db1752dd392a79ce4d98de329bd72f39276c0 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | Updated Virtual Keyboard screenshotKimmo Ollila2016-01-131-0/+0
| | | | | | | | | | | | | | Task-number QTRD-3768 Change-Id: Idbec3f92bb9b3ee2afe8d82b5218428c30a841fb Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* | Remove sensors demoKatja Marttila2016-01-041-10/+2
| | | | | | | | | | | | Change-Id: I49aa453ffed289a48d10707d6e15ff15a231ac14 Task-number: QTRD-3801 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* | Exclude Extras Gallery demo from B2Qt demosKimmo Ollila2015-12-301-0/+1
| | | | | | | | | | | | Change-Id: Iee230afd54ed80bde13e14a385d16442546f4254 Task-Id: QTRD-3780 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* | replace mediaplayer imageKatja Marttila2015-12-281-0/+0
| | | | | | | | | | Change-Id: I6e9b3fd29c5757a327da466500ff8a185aad9ceb Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* | Replace camera, about-b2qt and multimedia imageKatja Marttila2015-12-183-0/+0
| | | | | | | | | | | | Change-Id: I6b19116441176dc011216c5d39d619ef048ca817 Task-number: QTRD-3769 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* | Disable client-side window decorationsPaul Olav Tvete2015-11-301-0/+1
| | | | | | | | | | | | | | Since we're drawing server-side ones. Change-Id: I2ec4a74b103f8499160b7e608b21dd04a16190bd Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Improve About Qt for Device Creation demoKatja Marttila2015-11-278-167/+55
| | | | | | | | | | | | Change-Id: Iac874151028ede2f9114e317cb6f60fd16387445 Task-number: QTEE-997 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* | 'About Qt' title bold removed and content text color changedKatja Marttila2015-11-272-2/+1
| | | | | | | | | | | | Change-Id: I2fb3bbac801a6340daa193bd8e3ed432a5f70e99 Task-number: QTEE-988 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* | Demo of the new QtWayland compositor APIPaul Olav Tvete2015-11-2711-0/+1008
| | | | | | | | | | | | Change-Id: Icc027eb0994240848604bf0311e0d22c3a6d5020 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 06:40:11 +0000