summaryrefslogtreecommitdiffstats
path: root/src/core/api
Commit message (Collapse)AuthorAgeFilesLines
* Use MSVC's /WHOLEARCHIVE linker flagJoerg Bornemann2017-06-071-8/+0
| | | | | | | | | | The /WHOLEARCHIVE option was introduced in Visual Studio 2015 Update 2. Since we support no older MSVC version we can unconditionally use this option and remove our hack that simulates whole-archive by writing object file names into a linker reponse file. Change-Id: I32d2cb556c15f9a8aa2f77f608268e0af7ab6a1d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix compilation on clangMichal Klocek2017-06-011-4/+5
| | | | | | | | | | | Use 'visibilty' attribute instead of 'static' to hide extra symbols - clang compiler does not like it. Task-number: QTBUG-61138 Task-number: QTBUG-60565 Change-Id: Ibf4b469a179ad77b68ad4e54ab541e7276367a44 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix typos in symbol namesMichal Klocek2017-05-171-3/+3
| | | | | | | | | | | | | The symbol name for delete operators did not match the actual function definitions, however linker had no problem with that and simply skipping the symbol version export. Due to lazy binging in PLT this also got unnoticed when testing with test app, where delete was called on exit. Task-number: QTBUG-60565 Change-Id: I2be2f394a0097f1d06cf9ecda33ae5b22f83a77c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix broken ABI in qtwebengine libs between 5.8/5.9Michal Klocek2017-05-152-0/+125
| | | | | | | | | | | | | | | | | | Due to internal chromium 53 change in default allocator qtwebengine 5.8 release exported globally operator new, new[], delete and delete[] with Qt_5 'default' version. The issue was spotted and fixed after official 5.8.0 release. This causes ABI breakage since faulty released symbols are missing in upcoming 5.9.0 release and the software compiled against 5.8.0 will not work due to unresolved symbols at runtime. Readd the symbols, however mark Qt_5 symbols version as non-default, this way they are not picked up during link time, but they still could be resolved during runtime. Task-number: QTBUG-60565 Change-Id: I3320ac7785aea6b03443e8acd4b9d334e574d77f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Standardize override declarationAllan Sandfeld Jensen2017-04-211-2/+1
| | | | | | | | Update our overrides to Qt coding standard getting rid of Q_DECL_OVERRIDE and redundant virtual declarations. Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* [Doc] Add doc link between methods for request filteringMichael Brüning2017-03-301-0/+3
| | | | | | | | | | Adds a doc link between QWebEngineUrlRequestInterceptor and QWebEnginePage Task-number: QTBUG-54507 Change-Id: Ic9aa535fbf19c7c5ccf279ee660adf180057b56b Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Michael Brüning2017-03-242-6/+8
|\ | | | | | | Change-Id: I8a281e308ec1a6e93dc9756ba6399ca1b50210d8
| * Improve cross-links between QtWebEngine classes in docsFlorian Bruhin2017-03-082-6/+8
| | | | | | | | | | | | Change-Id: Iae853d4d3ab73306f90d93b62a419d1d440a3259 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Allan Sandfeld Jensen2017-03-021-4/+4
|\| | | | | | | Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61
| * Doc: Fix \sa links in the docsLeena Miettinen2017-02-091-4/+4
| | | | | | | | | | | | | | | | - Leave out the class name for the members of the class - Add brackets in the end of method names Change-Id: I5429be5620c5c192aa872d94ab047eebe39a13da Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add methods to issue various types of HTTP requestsViktor Engelmann2017-01-113-0/+526
|/ | | | | | | | | | | | | Added class QWebEngineHttpRequest, which describes a GET or POST HTTP Request. Also added overloads of method "load" to QWebEngineView, QWebEnginePage and WebContentsAdapter, which issue such a request. These can be used for example to simulate form-submissions. Task-number: QTBUG-53314 Task-number: QTBUG-53372 Change-Id: I85ac8cdd3d1557905b35e3172b922aba356d1c41 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Allan Sandfeld Jensen2016-11-252-2/+8
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ib9c9eca457c1c42dab948e6cb56d44b57d5da32a
| * Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-11-242-2/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/api/qwebengineurlrequestinfo.cpp src/core/api/qwebengineurlrequestinfo.h src/core/core_gyp_generator.pro Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
| | * ResourceType ABI/API fixupAllan Sandfeld Jensen2016-11-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Changes] The enum value ResourceTypeUnknown has changed value since there was a mismatch between 5.6 and 5.7+ definitions. In general any unknown ResourceType value should handled as unknown for forward compatibility, since more types are and can be added in later Qt versions. Change-Id: I0a9f8a2129d4549deeae01e199f432fbbf1bbb9e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | simplify setup of exclusive buildsOswald Buddenhagen2016-10-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | the simulator_and_device CONFIG flag is now gone. this also implies that we can set the debug_and_release and build_all flags based on the same condition. Change-Id: Ib16d05213e738a961c9e0b232829985b8ad64a50 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Fix building when QT_NO_OPENGL is definedAndy Nichols2016-10-021-2/+9
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54327 Change-Id: I759598d56aa0a74b64092365b422a743fb508ac6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-231-3/+3
|/ / | | | | | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-171-1/+1
| | | | | | | | | | | | | | iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Change-Id: I0be78eb67b9f9867548108235eb180874f66cb95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-311-0/+1
|\| | | | | | | Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
| * unifiy ios simulator&device handling with that of debug&releaseOswald Buddenhagen2016-05-231-0/+1
| | | | | | | | | | Change-Id: Ifb141ae83330cd320896b75090b8bb8e51b853a5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-203-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
| * Silence zero-as-null-pointer=constant warningsAllan Sandfeld Jensen2016-05-193-3/+3
| | | | | | | | | | | | | | | | This appears to have been added to headerclean and is now preventing us from integrating. Change-Id: I7c25a85c0d62c945d4f4a68f559000fab8c880cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-091-0/+2
|\| | | | | | | Change-Id: I2843a633721212850db77c772caf24e0ea82b450
| * Fix QtWebEngineCore::initialize() for Qt < 5.6.1Joerg Bornemann2016-05-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt versions < 5.6.1 the constructor of QCoreApplication directly calls QCoreApplication::init and QtWebEngineCore::initialize() in turn. That means that qobject_cast<QGuiApplication*> cannot work, because the object is not fully constructed yet. This was fixed for Qt 5.6.1 in commit qtbase/1b441c39. This patch turns off the fix for QTBUG-51789 when building QtWebEngine against Qt versions older than 5.6.1. Task-number: QTBUG-51789 Change-Id: I092fb559ea4449bd443737d5962b4b87dee88cdd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Never call QtWebEngine::initialize from DllMainCorentin Jabot2016-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On windows, calling QtWebEngine::initialize from DllMain may crash, depending on what QPA backend is used. We make sure to only add a qAddPreRoutine initializing QtWebEngine if there is no instance of QCoreApplication. By doing so, we support linking to QtWebEngineWidget from a plugin, while still initializing the WebEngine automatically when linked to the main application binary. Task-number: QTBUG-46720 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> (cherry picked from commit 6a8d99ab00ace2084820547572dc05ac8ad2bc5a) Change-Id: Id3b2c1e21e01808cef124f8ece6b247b1ba613cb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-251-0/+5
|\| | | | | | | Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
* | Add comments to new ResourceType enumsKai Koehne2016-04-191-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51808 Change-Id: Ie612410b95cc13363bfca0b412deac3a7e65f687 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-0/+3
|\| | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Doc: Fix documentation about cookie storesKai Koehne2016-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Document QWebEngineUrlRequestInfo enums as new in 5.7Kai Koehne2016-04-061-2/+2
| | | | | | | | | | | | Change-Id: I143c1ff7556777813387b664a59bafba1c9a3a58 Task-number: QTBUG-51808 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: New QWebEngineUrlRequestInfo::ResourceType valuesLeena Miettinen2016-04-031-0/+4
| | | | | | | | | | | | | | | | | | Add docs for ResourceTypeCspReport and ResourceTypePluginResource Task-number: QTBUG-51808 Change-Id: Id8b0f90f201670a927caf67e6cdff1ade211ebdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Basic adaptation to Chromium 49Allan Sandfeld Jensen2016-03-072-0/+4
| | | | | | | | | | | | | | | | Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-103-0/+7
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
| * Fix QDoc warning for QWebEngineUrlRequestInterceptor.Michael Bruning2016-02-041-0/+3
| | | | | | | | | | | | | | Explains the info parameters internal change tracking. Change-Id: I19c8f96d8ecd0b2dc8a56d3d01cc91dd2b664abd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Fix build against Qt 5.5Allan Sandfeld Jensen2016-02-042-0/+4
| | | | | | | | | | | | | | Make QtWebEngine 5.6 buildable as an upgrade to Qt 5.5 Change-Id: Ic5de7fc414374d8492434dd5b956cbb90fff2e3e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-043-37/+3
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Fix multi-thread protection in custom url handlerAllan Sandfeld Jensen2016-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | The classes were not properly protected against race conditions. To solve this there is now a class shared between the two thread that is not deleted until the classes on both threads have been deleted. Change-Id: I499bd98805ae7a195aca42f30610eb6c2b0fd0f7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Doc: remove docs for QWebEngineCookieStore::FilterRequest classLeena Miettinen2016-01-191-32/+0
| | | | | | | | | | | | | | The class and its members were removed. Change-Id: Ib8e892da1f9e10ffcf9861f75615ef48d3697886 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Correct QWebEngineUrlRequestInterceptor documentation.Michael Bruning2016-01-181-3/+1
| | | | | | | | | | | | | | | | | | | | The documentation was still based on the initial version of the method, where it had to return a boolean value. This is no longer the case and hence removed from the doc. Change-Id: Ica1e4a769631c0169bc5e59abd54c25a416cf4a9 Task-number: QTBUG-50513 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Unify license header usage.Jani Heikkinen2016-02-0116-176/+224
|/ | | | | | | | | 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>
* Remove FilterRequest from qwebenginecookiestoreMichal Klocek2016-01-153-47/+0
| | | | | | | | | | OnCanSetCookie and OnCanGetCookies should both be mapped to API. Since the other call is missing (filter cookies which should be send) remove existing one from 5.6 Change-Id: I4f42c4a1fee6add7a5efffaf4c38877a1f35ce61 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove callback functions from qwebenginecookiestoreMichal Klocek2016-01-152-84/+33
| | | | | | | | | | Remove all callback api calls, rename getAllCookies to loadCookies, update documentation. New function name reflects the fact the cookieAdded signal is always emitted when cookies are loaded from the store. Change-Id: Iab7bb04871c7396d2e23306a10084d425426a19f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix more syncqt warningsAllan Sandfeld Jensen2016-01-057-8/+9
| | | | | | | Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix an assertion in QWebEngineCookieStoreSzabolcs David2016-01-052-0/+9
| | | | | | | | | | Don't process pending cookies after resetting the CookieMonster to 0 in the CookieMonsterDelegateQt. We are destroying the old cookie store, so we can reject the pending cookies here. Task-number: QTBUG-50160 Change-Id: I0b2ca7ee0f5e3fdcf99680bb9c0a2772a10ff3f4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Move WebEngine initialization to core libraryAllan Sandfeld Jensen2015-12-152-0/+95
| | | | | | | | This means QtWebEngineWidgets no longer needs to depend on and link to the QML API. Change-Id: If59693bf0ae1fb43dc86c141daf4e09c8cc68c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix some syncqt warningsJoerg Bornemann2015-12-113-0/+26
| | | | | | Change-Id: I9f224e96138117bdf202084231ce6c805e15f5b2 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Make use of QObject's d-pointer in QWebEngineCookieStoreJoerg Bornemann2015-12-103-9/+7
| | | | | | | | | This safes us from managing d_ptr/q_ptr pairs and saves a bit of memory. Change-Id: Icdd692c5ddf0980de980bebb691ecf51b738acaa Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: mark QWebEngineUrlRequestInfo::changed() internalLeena Miettinen2015-12-031-0/+3
| | | | | | | ...to stop QDoc from printing an error. Change-Id: I22ac3d94e4f8ad53c0bfbda97a71c615a43a2262 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: remove obsolete docs about URL requests and scheme handlerLeena Miettinen2015-12-022-12/+0
| | | | | Change-Id: Ic567bcd9ba91d82c1df1ef42f6b57e4209418f22 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Rename setExtraHeader to setHttpHeader in QWebEngineUrlRequestInfo.Michael Bruning2015-12-022-3/+3
| | | | | | | | Also make a small update to the documentation of the method. Change-Id: Ie19578ffccfd30c884cdfe882dffcdae6637e8e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>