summaryrefslogtreecommitdiffstats
path: root/src/core/api/qwebenginecallback.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-101-0/+2
|\ | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
| * Fix build against Qt 5.5Allan Sandfeld Jensen2016-02-041-0/+2
| | | | | | | | | | | | | | Make QtWebEngine 5.6 buildable as an upgrade to Qt 5.5 Change-Id: Ic5de7fc414374d8492434dd5b956cbb90fff2e3e Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
* | Unify license header usage.Jani Heikkinen2016-02-011-11/+14
|/ | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix more syncqt warningsAllan Sandfeld Jensen2016-01-051-1/+1
| | | | | | | Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Properly mark value based classesKai Koehne2015-11-021-0/+7
| | | | | | | Change-Id: I937ce0daf2fa73d7179a5f62585abfb1acea7264 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix #include's in public headersKai Koehne2015-08-041-3/+3
| | | | | | | | | | | Uniformly use the <Module/class.h> style, like https://wiki.qt.io/Coding_Conventions mandates. Change-Id: I4c05599fa689f375158fd3b0a54aada8571e5c59 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Move QWebEngineCallback to core API and templatize CallbackDirectoryAndras Becsi2015-06-081-0/+92
This undocumented helper template will also be utilized by the core API since Chromium's content API heavily relies on callbacks. To make the internal CallbackDirectory easily extendable with new types, templatize its callback registration and dispatching functions to be able to replace its type switches and the internal union. Change-Id: I3f636fef48973ac95253f1c1bd396550286e571e Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>