summaryrefslogtreecommitdiffstats
path: root/basicsuite/qtwebbrowser
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Mikko Gronoff2016-12-081-2/+2
|\ | | | | | | | | | | | | * 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-081-2/+2
| | | | | | | | | | Change-Id: Id4731a6438c95ca9abca5e8477bd17228c55cfc7 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Update license headersKari Hormi2016-06-072-18/+81
| | | | | | | | | | | | | | - Update all license headers to commercial+BSD Change-Id: I7dbf9d967cde7dfe21bef255ea63652b42fccb71 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* | Update license headersTopi Reinio2016-05-031-1/+1
|/ | | | | | | | | - 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>
* 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>
* 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>
* Replace title, description and exclude files with one demos.xmlKimmo Ollila2016-01-273-8/+0
| | | | | Change-Id: Ice4d810389ebf186cdfced3964c3a1c7e12e1ead Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* add browser demoKatja Marttila2016-01-199-0/+124
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>