aboutsummaryrefslogtreecommitdiffstats
path: root/qtwebchannel.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove outdated qmake pro-filesØystein Heskestad2021-07-191-9/+0
| | | | | | Task-number: QTBUG-95167 Change-Id: I199e41cd2bd582b3f4d47b6d516fa2f506f93855 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/wip/cmake' into devAllan Sandfeld Jensen2021-01-291-0/+6
|\ | | | | | | | | | | | | Regenerating and fixing as needed. Fixes: QTBUG-90661 Change-Id: Ief9f044d4b9ea2ce8130b11031fb93b6e673fbdd
* | Do not build qtwebchannel on IntegrityKai Koehne2020-07-151-0/+2
|/ | | | | | | | | | Integrity is causing problems for some patches. Pick-to: 5.15 Fixes: QTQAINFRA-3834 Change-Id: I6ad1e8dca42458655047efdc84371692a9e8e252 Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Adapt to rename to QtWebChannel and rename resource path as well.Milian Wolff2014-07-171-0/+1
This is a minor cleanup commit. Renaming the .pro file is required for qt.pro to find it. The rename of the resource path makes it more explicit by using the module name. Change-Id: Ib724882d02d2a8aea7468ef984ed573dca1d3e7b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>