summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Test only for KHR headerv5.6.0-alpha1Samuli Piippo2015-09-011-3/+1
| | | | | | | | | Raspberry Pi toolchain from yocto uses older khr headers that do not include defines for KHRONOS_FALSE and KHRONOS_TRUE, but can still be used to build qtwebengine correctly. Change-Id: Ia7a6420ba142141ebb16d880f989eb56f892f1a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix use of empty credentials for HTTP and proxy authenticationPeter Varga2015-09-016-6/+17
| | | | | | | | | | Empty user and password fields are valid for HTTP and proxy authentication. Thus it does not mean that the authentication is cancelled. For informing the engine about the cancellation of the authentication dialog make QAuthenticator instance null. Change-Id: Iba1ce9d375b9b37c23f7a91fb583606d75d04af5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Enable parts of tst_QWebEnginePage::textSelectionAllan Sandfeld Jensen2015-09-011-6/+16
| | | | | | | | We can support the basics of the test though we are missing the actions to move selections. Change-Id: Iba1eae0d17857761145cd99c77a58a7d2f2b2c4c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix crash on exit when using the inspectorJoerg Bornemann2015-09-011-0/+1
| | | | | | | | | Destroy the DevToolsHttpHandler early on, because ~DevToolsHttpHandler assumes the browser's UI thread is still running. This fixes a crash on exit in tst_inspectorserver. Change-Id: I98476231b709d60c249e58e17b09de70aed6792b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix tst_QWebEnginePage::runJavaScript for "undefined"Joerg Bornemann2015-09-011-1/+1
| | | | | Change-Id: Ic49f07ee1a1d0384eba33dd2090ebe2650600107 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* adjust W_QTEST_MAIN to changes in QTestLibJoerg Bornemann2015-09-011-0/+5
| | | | | | | | Needed for BLACKLIST support. Change-Id: I43f84a3150d0336b3f1702329f0c386545633f51 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* remove tst_qwebengineframe from the default buildJoerg Bornemann2015-09-011-1/+0
| | | | | | | It's broken beyond repair and must be merged into tst_qwebenginepage. Change-Id: I16f3213cd63d7897eb2f95bac9c4fc1d41342fb3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add default inspect element context menu itemAllan Sandfeld Jensen2015-09-015-0/+20
| | | | | | | | Adds inspect element to the context menu when there is an attached inspector on the page. Change-Id: Id3c8a5be34318c12ab331b6611219bd59b7b70be Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Workaround for broken recursive qmake callSamuli Piippo2015-09-011-4/+5
| | | | | | | | | | | Running qmake recursively does not take .depends into account and goes through the SUBDIRS in the order they were added. Because of this, the qmake_extras.gypi is generated in wrong order and is not used by ninja later on. This causes cross compilation to fail. Task-number: QTBUG-45706 Change-Id: I476930233824d5414e35151e6b9a2695abb4e9dd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add invokable to QQuickWebEngineProfile to set cookie clientAndras Becsi2015-08-286-1/+61
| | | | | | | | | This makes it possible to set a cookie client in the C++ part of a QtQuick application to receive notifications about cookies. Add setting for blocking third party cookies to quicktestbrowser. Change-Id: I627eaab067e92a7be5b36ffed68794e54c7be0e8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Use the default composition colors for IME compositionAndras Becsi2015-08-281-6/+1
| | | | | | | | | | | | We should not set the background color coming from the input method event since its color scheme might not match the color scheme of the web page, which can make the entered text unreadable. Instead we should set the default as used by the aura and mac implementations of transparent background and black underline of the current editing context. Change-Id: I3a4ec5672a917b029fb57cfcc6b36bf93209af2c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix embedded build after the update to 45-based branchAndras Becsi2015-08-272-0/+8
| | | | | | | Add missing virtual function implementation. Change-Id: Icad8fee6306c742530f1890d14e941e686dc1253 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Move custom URL scheme handlers to coreAllan Sandfeld Jensen2015-08-2714-97/+110
| | | | | | | | Makes the custom URL scheme handler API public, and moves it to core so that it may be shared with the QQuickWebEngine API. Change-Id: I745cb088df6f4cd11b1ac7c8c3c76f112032cb38 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add exit full screen web actionAllan Sandfeld Jensen2015-08-276-0/+25
| | | | | | | | Adds a web action that can be used for exiting fullscreen mode, and include it the context menu whenever in fullscreen mode. Change-Id: I7aa729a86f9ba9df476766cd40f87d9385948fea Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add support for blocking cookiesAndras Becsi2015-08-276-1/+38
| | | | | | | | | This patch adds acceptCookie virtual function that is called when a request wants to set a new cookie and can be overridden to intercept or block these cookies. Change-Id: I8b932d4176ffc3c0ac48b1656486d5492cabaefd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update to Chromium 45.0.2454.79Allan Sandfeld Jensen2015-08-263-3/+2
| | | | | Change-Id: Id986be0af632884ae4e7d0fb2023e71c449a9eae Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix automatic resource file inclusionJoerg Bornemann2015-08-262-2/+2
| | | | | | | | | Commit c7334fbc broke the automatic resource file inclusion. qmake's exists function checks at the location of the .pri file, not the location of the .pro file. Change-Id: I54f1bc664c06c5675ef26341619142bc58f0831e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Widgets: Add fullscreen supportSzabolcs David2015-08-2613-19/+106
| | | | | | Change-Id: Ibf1697d2bb3b3af5e7d71149305c5acffba43f0f Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix QAccessible name and description calculationAdam Kallai2015-08-262-4/+97
| | | | | | | | | | | | | | | The logic was removed in 1881f56d65b3981b176d99262f5266cf9ff76be3. There is no platform independent implementation in Chromium for calculating Accessible name which follow the W3C Accessibility standard. We need to apply this logic in order to get Accessible name and description correctly. It also fixes the QWebEngineAccessibility test cases. Change-Id: I733c6311301c43610b7a9aaf22c73c2e5d368c70 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add inspect element webactionAllan Sandfeld Jensen2015-08-266-0/+24
| | | | | | | | | Adds the missing InspectElement webaction from QtWebKit. It is not added by to any context menus by default and only has an effect when an inspector is attached. Change-Id: Ic8c67c797e5dfe266fb692ffc97577b842458a79 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Consistenly use Q_DISABLE_COPY in public APIKai Koehne2015-08-265-1/+5
| | | | | | | Improves error messages for people trying to copy ... Change-Id: If95e33058ebff46ab39164ba6226b3396b6aef15 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* move automatic resource inclusion to pri filesJoerg Bornemann2015-08-2512-10/+4
| | | | | | | Avoid code duplication. Change-Id: Icd270ff4e45112111b7eb9590e415947f63ce15b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* do not define TESTS_SOURCE_DIR in core testsJoerg Bornemann2015-08-251-3/+0
| | | | | | | It's currently unused, and we can use QFINDTESTDATA instead. Change-Id: Id439b8b6ea3c9dbf5299c271d3974c11a44675bc Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/dev' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2015-08-259-256/+19
|\
| * Merge remote-tracking branch 'origin/dev' into 5.6Allan Sandfeld Jensen2015-08-259-256/+19
| |\ | | | | | | | | | Change-Id: Iee44f6f41c00838c9efe30f600200307bdef770a
| | * fix revision for httpAcceptLanguage property of WebEngineProfileJoerg Bornemann2015-08-242-3/+4
| | | | | | | | | | | | | | | Change-Id: I374d6ffa968e6cc9a3317f0c8860402da84a1b5b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Demo browser: add proxy supportPierre Rossi2015-08-197-253/+15
| | | | | | | | | | | | | | | | | | | | | And remove NetworkAccessManager-related dead code. Change-Id: I6246aaaa1bbdda43ed0453e7acd0f2df33f58edd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Doc: edit docs for QQuickWebEngineSettingsLeena Miettinen2015-08-252-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add docs for missing PluginsEnabled value for QWebEngineSettings::WebAttribute. Change-Id: I368fff274609941d6435ddf3343b81bca6013945 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Respect Qt system-harfbuzz settingAllan Sandfeld Jensen2015-08-252-0/+2
| | | | | | | | | | | | | | | | | | | | | Link with system harfbuzz when Qt has been configured to do so. Change-Id: I6921397915f069b06e6447987744c0186b6c7ce0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Rebasing on Chromium 45Allan Sandfeld Jensen2015-08-2518-46/+50
| | | | | | | | | | | | | | | | | | | | | Fixing the minor differences needed to work with Chromium 45. Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | MSVC: force export of API symbolsJoerg Bornemann2015-08-251-0/+15
|/ / | | | | | | | | | | | | | | | | | | | | The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. As there's no equivalent for this in MSVC we create a dummy C++ source file that includes every API header file to make sure that every __declspec(dllexport) is honored. Change-Id: If0dafedceb52046aecde60b2a2a624df8ab219b4 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | set Accept-Language in content::RendererPreferencesJoerg Bornemann2015-08-243-0/+14
| | | | | | | | | | | | | | This amends commit 2a56ec7ce4713711b55bb1dfc86a4320d943f606. Change-Id: I8103197f08c985557000de36c37ad80e1ceadf24 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix the build on embedded linuxAndras Becsi2015-08-246-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix compilation with Visual Studio ExpressKai Koehne2015-08-211-0/+1
| | | | | | | | | | | | | | This replaces commit 28fd17b3 in the chromium submodule. Change-Id: Ifb59ad0101129d18ae4704126fa152e201d35e83 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add documentation for cookie API and request interception in coreAndras Becsi2015-08-203-4/+250
| | | | | | | | | | | | Change-Id: I6908ff3da9e0c78c3cf3d9b27d6c532029423d24 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: clean up QWebEngineScript docsLeena Miettinen2015-08-201-43/+48
| | | | | | | | | | | | | | | | | | | | - Add missing documentation - Remove unnecessary \brief, \param, and \return commands - Edit for language and style Change-Id: Iff9ddc56ab32af783831c3a962b0967fcbddde24 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Doc: reorganize and rename docsLeena Miettinen2015-08-1917-200/+508
| | | | | | | | | | | | | | | | | | | | | | | | - Move general docs to src/webengine/doc/src - Remove a dedicated .qdocconf for Qt WebEngine Core, build its documentation as part of Qt WebEngine - Describe all Qt WebEngine modules on the Qt WebEngine index and overview pages - Add a wireframe drawing on the architecture Change-Id: Ib4261d1a16bbaf313d0f858515184a96dab524a5 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* | Revert "Introduce ProxyResolverQt"Pierre Rossi2015-08-195-198/+12
| | | | | | | | | | | | | | | | | | This reverts commit 0e006b8ea755ebad01faf3e747e61abdf158289a. The workaround is not needed anymore since the v8 proxy resolver is now used by default. Change-Id: Ifea4ca6c6a0b0442cc1d8d22b1eb1553f3319524 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: clean up QWebEngineProfile docsLeena Miettinen2015-08-181-29/+45
| | | | | | | | | | | | | | | | | | - Add missing documentation - Remove unnecessary \brief, \param, and \return commands - Edit for language and style Change-Id: I6b338834e5695cf135874f80e71151a5f5dd54e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: clean up QWebEngineScriptCollection docsLeena Miettinen2015-08-181-28/+31
| | | | | | | | | | | | | | | | | | - Add missing documentation - Remove unnecessary \brief, \param, and \return commands - Edit for language and style Change-Id: Ie2169475539f816b876ad65d9ac9ae228dd55ada Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-08-1878-260/+1489
|\ \ | |/ |/| | | Change-Id: I9977663123560a22f493b8c02d02de8897b38666
| * Add the GPLv3 license textThiago Macieira2015-08-132-0/+698
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * Fix crash on XCB GLES2 and WaylandAllan Sandfeld Jensen2015-08-121-6/+0
| | | | | | | | | | | | | | | | | | We can and must request the "egldisplay" from QPA, otherwise we get the wrong resource. Task-number: QTBUG-47301 Change-Id: I8bcd94415aa8f22b0d868ad751017f5babddf751 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Fully qualify libEGL.so.1, libEGLESv2.so.2 librariesKai Koehne2015-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | look up the libEGL, libEGLESv2 libraries by their major version number when loading them dynamically on embedded Linux. The libEGL.so, libEGLESv2.so files are usually only there when development packages are installed. Change-Id: Ic17976506064008540201ceffa12077e1b2173f8 Task-number: QTBUG-45801 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Doc: Added a note about setting feature permission to a pageVenugopal Shivashankar2015-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | The feature premissions set ahead of a feature request has no effect. The QWebEnginePage::setFeaturePermission method serves pending feature requests only. Task-number: QTBUG-47173 Change-Id: Ifff4dadc56fae1ecdcce9029a15d57576a830923 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
| * Doc: Fixup QWebEngineScript documentation.Pierre Rossi2015-08-051-2/+1
| | | | | | | | | | | | | | drop the preliminary as it is public API, and fix a typo. Change-Id: I2753ef06f9afc9f7a9526353286fb22d239e3b5f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Fix docs to use iconUrl/iconUrlChanged.Florian Bruhin2015-08-042-4/+4
| | | | | | | | | | | | | | | | The docs presumably were copied from QtWebKit and this didn't get adjusted when icon()/iconChanged() was changed to iconUrl()/iconUrlChanged(). Change-Id: Iccecc7b0e1c69f5242bddae2dedb4135120e3519 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Make QtWebEngineProcess use full 4 GiByte of memoryKai Koehne2015-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | Pass /LARGEADDRESSAWARE the the MSVC linker to allow allocating more than two GiByte of memory for 32 bit. The flag is a NOOP for 64 bit. Task-number: QTBUG-47129 Change-Id: I82c4a7bc99e9042c4901425b37202d7977c0bcaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Fix error message for OpenGL resource sharingPeter Varga2015-07-311-1/+5
| | | | | | | | | | | | | | | | | | Method nativeResourceForContext() fails if share context is not set. It may be called earlier than method ShareGroupQtQuick::AboutToAddFirstContext() that performs the same check. Change-Id: Ib1eaabc83e59c75a7610ba214b81e50aa4984baa Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Add private header warningKai Koehne2015-07-2430-0/+330
| | | | | | | | | | Change-Id: I95ae03b34631f166d2eed68e20282eb624ff408a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>