summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix loadFinished signal in case of interrupting error page loadingPeter Varga2014-10-072-0/+3
| | | | | | | | | | If the error page loading is interrupted by loading of another page the signals of the second page should not be suppressed. Change-Id: I537daabf80ffed005acaaf2a6019e52a3250c523 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu>
* Fix WebEngineSettings::setDefaultTextEncoding()Szabolcs David2014-10-072-6/+5
| | | | | | | | | | Add the missing default_encoding to the web preferences. Use a 0ms timer instead of the 100ms in order to apply the settings as soon as possible and avoid waiting mechanisms in the test. Change-Id: I12f1a6dd68b29c2b287b160eea1ad5a5fb169c14 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update build configuration for eLinux after update to Chromium 37.Zeno Albisser2014-10-063-1/+6
| | | | | | | | | | | | | | | | | | | | The build configuration requires the following changes: - toolkit_views=1: for native_theme_aura, as otherwise nine_image_painter_factory.cc would be excluded. - use_system_harfbuzz=0: we do not want to rely on this being provided on the system, therefore being explicit. - want_separate_host_toolset=1: assures that icuuc gyp target will be available. The file gl_surface_ozone.cc must be added to the exclusion list to avoid duplicate symbols with gl_surface_at.cpp. The defines EGL_API_FB and LINUX must be set to 1, to explicitly define that we are using EGL and are building for a linux target. Change-Id: If6722ecbfd0655fe7852d52a606f27c18304f717 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* gfx::LoadLibrary has been replaced in Chromium by base::LoadNativeLibrary.Zeno Albisser2014-10-061-8/+14
| | | | | | | | Adding a local LoadLibrary function to wrap the new call to base::LoadNativeLibrary and do the error handling. Change-Id: Iaab23d3731508fbbf2dadb27d34c53fd65095830 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update OzonePlatformEglfs after update to Chromium 37.Zeno Albisser2014-10-062-6/+54
| | | | | | | | | | The Ozone platform base class has received several new pure virtual functions that needed to be implemented. Most of the functions are implemented according to how it is done in OzonePlatformGbm. Change-Id: Ibab75ae0891b67d03f705da611949ed6cf75ad9f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Examples: Fix warnings in webenginewidgets/browser example.Michael Brüning2014-10-064-0/+7
| | | | | | Fixing unused parameter warnings. Change-Id: Ic4b60b85f2434aa745e1aeb412984dc3f8a62820 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Examples: Replace deprecated Q_WS_MAC defines with Q_OS_OSX.Michael Brüning2014-10-063-11/+11
| | | | | Change-Id: I2d9f23a9aa8871df7b3054628a2db49ea858c522 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Unskip the working tests in tst_qwebengineframe.cppSzabolcs David2014-10-031-24/+12
| | | | | Change-Id: I9db9bbfd106e8cf939108dbcadf27b7a43923662 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Doc: Fix issues in .qdocconf filesTopi Reinio2014-10-032-3/+3
| | | | | | | | | - Remove url variable (it's included from global doc config) - Fix qhp selector for QML types - Sort the examples in qhp Change-Id: I7f72aebe4f5482ac922a294ad156f8a73e4ccc6e Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Use proper module name for Qt WebEngine WidgetsTopi Reinio2014-10-035-6/+12
| | | | | | | | | | Fix the name used for the \module command to include the module name to properly generate the C++ class reference page for Qt WebEngine Widgets, and link to the new page from the module landing page. Change-Id: If0814650fa16ecf1b5c66e8e46e598d576a8c21d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Provide a fallback for the QtWebEngineProcess executable path.Michael Brüning2014-10-021-5/+9
| | | | | | | | This makes deployment easier and was also what was done in QtWebKit for the WebKit2 WebProcess executable Change-Id: I2245c1f3337f19509c08c08c0baf40dc0a964890 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Update submodule SHA1 with Win64 desktop OpenGL fix.Michael Brüning2014-10-021-0/+0
| | | | | Change-Id: Ide283188e04ed4f6619040225c40c2e6850514c8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Create a QCoreApplication in QtWebEngineProcess as well.Michael Brüning2014-09-301-0/+5
| | | | | | | | | | | | A QCoreApplication is needed in order to correctly load the configuration from qt.conf and setup the Qt environment variables accordingly. This is important to be able to deploy applications. This patch creates a dummy QCoreApplication in process main to have the environment setup correctly. Change-Id: If536b9edf357d5925fee02f2528872101139f87e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Edited docs according to writing guidelines.Jerome Pasion2014-09-292-93/+85
| | | | | | | | | | | | | -added \since and added commands such as \readonly -converted enum values to use \value -edited language and other minor issues. -only the main Qt WebEngine, the widget docs will be edited later. Change-Id: Ifbb76a6472b5efede15daebc78d605b8b449d957 Task-number: QTBUG-40757 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Import the Qt WebKit porting guide from the wikiJocelyn Turcotte2014-09-293-1/+295
| | | | | | | | Also added a link to it in a new section briefly explaining the difference between Qt WebKit and Qt WebEngine. Change-Id: I89529c701e7f9faae1e4b7d15d5e5d6aec0c8f9f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Various doc tweaksJocelyn Turcotte2014-09-295-24/+10
| | | | | | | | | | | | - Fix the example pages titles to match the qdocconf files - Remove information not as relevant for QtWebEngine as it was for QtWebKit - Fix the QtWebEngineWidgets snippet not to refer to webengine - Remove the dead link and the reference to Arora from QtWebEngine Change-Id: Ib3c57c8dd534330b3323c94fb2217374b3e52cf9 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update chromium submodule.Michael Brüning2014-09-261-0/+0
| | | | | | | | This pulls in the changes to the .gitattributes and for disabling the gpu blacklisting for llvmpipe. Change-Id: Ie298901ec64802dbbd64399d080e01bb500b10e6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Win] Use automatic destruction for PbufferGLSurfaceWGL.Michael Brüning2014-09-261-5/+2
| | | | | | | | | | | | PbufferGLSurfaceWGL is a reference counted class, hence deleting it manually triggers an assert in debug builds if Release is not called or the reference count is non-zero. Using a scoped_refptr prevents this and deletes the object correctly. Change-Id: I7e5ff783afc367e06d872b8d118c2ff83627b836 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Unskip QWebEngineSettings::JavascriptCanOpenWindows related testsSzabolcs David2014-09-261-35/+5
| | | | | | | | | | | Window.showModalDialog() is not supported since Chromium 37, so we can remove the showModalDialog test case. If the view is not visible, the width and the height of the requested geometry is always 0 in tst_QWebEnginePage::openWindowDefaultSize. Change-Id: I420828815bc9528070ca58a9e42dea44517aeafc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Prevent OS X from picking a wrong version of clang from the envAndras Becsi2014-09-262-7/+15
| | | | | | | | | | | Until now we relied on the PATH to pick the right clang version on OS X which turned out to be a source of issues on build nodes that have a lot of old cruft lying around which was picked up by gyp. Set make_clang_dir so that gyp uses the configured clang version from Qt and remove the env manipulation from our gyp script. Change-Id: I4ac679ea56fa874eecaa578aad77b462445c0caa Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Remove IOBlootooth.h import from chromium source.Andras Becsi2014-09-261-0/+0
| | | | | Change-Id: Iadd41a522aad40f7edf7205126d4824211f4c390 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add Desktop OpenGL backend for WindowsKai Koehne2014-09-259-20/+151
| | | | | | | | Enabling rendering into a WGL backbuffer, in addition to the EGL/angle one. Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Skip tst_QWebEngineFrame::setUrlWithFragment API testSzabolcs David2014-09-241-0/+1
| | | | | Change-Id: I66b6cb593ed6fe7cc2e74737829991631606709f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove unneeded QWP_PATH environment variable for quick tests.Michael Brüning2014-09-242-2/+0
| | | | | | | | | When the PATH is properly set up, this should not be necessary and it overrode the explicitly set QTWEBENGINEPROCESS_PATH. Change-Id: Ie83a9f4f15f2203329c44fd9653adbb19c62672c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix issues on HiDPI displaysAndras Becsi2014-09-242-2/+5
| | | | | | | | | | | This patch fixes widgets rendering on HiDPI displays and notifies about the a potential device pixel ratio change when the window is moved. This addresses the blurriness when a web view is moved between an attached LoDPI screen and HiDPI screen resulting from the device pixel ratio not being updated. Change-Id: I97af0199c07deac8bbe4688c665aaa6df1608ae9 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix an assertion in web_content_delegates_qt.cppAdam Kallai2014-09-233-24/+41
| | | | | | | | If we get a replacement content, we can see a DidFinishLoad event for a frame. This error page should be ignored based on the frame. Change-Id: I3e1cd1773e8c5fc608605197c957011ddf258123 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove unneded OS_CHROMEOS defineAndras Becsi2014-09-231-1/+1
| | | | | Change-Id: Ia75177e8759c5ca10f74cc635d600999fb8205fb Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Set arm_tune to empty string if mtune flag is not set by toolchainAndras Becsi2014-09-221-1/+1
| | | | | | | | | | | Since the default arm_tune option applied by chromium is not recognized by our gcc toolchain set arm_tune to empty string to prevent chromium from setting a default. Our toolchains set the arm version which already implies the corresponding mtune option anyway. Change-Id: I0291bd4f0e5706597d37f914e4eeefbd75397bbf Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Bring back the mapping of touch IDs to fix flingingJocelyn Turcotte2014-09-192-7/+42
| | | | | | | | | | | This logic was removed in 3a30ed4ecc9c828641daef85f88f93baf78826b6 but was still needed by the velocity tracker used for fling gestures. Also disable swipe gestures in the gesture config since they have unwanted side-effects on the gesture detection and we don't use them. Change-Id: Icbb44a4c27e2cd243d631484d03a956e9dce64dc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the default render theme on eAndroidAndras Becsi2014-09-181-1/+1
| | | | | Change-Id: I94ccd40dbba9a3c6a962ebaca6d3d5ab316de8d5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Hide QWebEngineCallback from the docsPierre Rossi2014-09-185-7/+91
| | | | | | | | | In the same fashion as what is done in QObject::connect's documentation, we can keep it simple here and simply document what is expected. Change-Id: I98a09280870cf0aab935fd0cb69401bb98134145 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* QtWebEngine should join the Beautiful Stack Trace ClubJocelyn Turcotte2014-09-182-3/+6
| | | | | | | | | | | | | Configuring Qt with -force-debug-info -no-strip should carry the needed cflags to ninja through gyp. Also prevent stripping the library in release with force_debug_info. qmake will already call strip --strip-unneeded by default when running make install for release builds so remove that condition completely from core_module.pro. Change-Id: Ic31fca5b4365d61161f2500c2de011faa3e19c14 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add widgets settings doc plus revive QWeb(Engine)View::settingsPierre Rossi2014-09-178-2/+246
| | | | | | | Also silence some warnings by tagging functions as reimplemented. Change-Id: I0572e466709d433a44c7a154ff37e43178a6013f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Tests] Change expected QAccessible::role to WebDocument.Michael Brüning2014-09-161-2/+2
| | | | | | | | That is the role that is returned from the WebView. Change-Id: I9ab817e259c8fe69d756ffa576082066cf6b4ea8 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix toPlainText related crashes in QtRenderViewObserverSzabolcs David2014-09-151-2/+2
| | | | | | | | | | Use the WebFrame's more reliable contentAsMarkup() and contentAsText() methods instead of going down to the Document element. Change-Id: I332e24375e074124099b59e8a784a0a038c6f70b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build for embedded androidAndras Becsi2014-09-157-17/+17
| | | | | Change-Id: I1edd16e6875198d7480897e7b2e2fbf68b245883 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Do not crash on QQuickWebEngineViewPrivate::closeJocelyn Turcotte2014-09-121-1/+1
| | | | | | | | This method will be called if JavaScript calls window.close() and it currently crashes because of Q_UNREACHABLE. Change-Id: I50e261ff459879e9befb2a754f0108d7d2f18ca2 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Disable the unified toolbar on OS X in QtWebEngineWidgets examplesJocelyn Turcotte2014-09-122-2/+0
| | | | | | | | | The unified toolbar doesn't work yet with QOpenGLWidget, which we use to render RenderWidgetHostViewQtDelegateWidget. Task-number: QTBUG-41179 Change-Id: I5b33d8c06600162974a05bff5fec6e1c7b59e939 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Enable JavascriptCanOpenWindows and LocalStorageEnabled by defaultJocelyn Turcotte2014-09-121-2/+2
| | | | | | | | | | | | | Both QWebEnginePage::createWindow and QQuickWebEngineNewViewRequest behave as if JavascriptCanOpenWindows was disabled by default, when the application isn't handling new window signals. LocalStorageEnabled should have no negative impact to be enabled beside the used disk space, but is still less inconvenient than cookies or disk cache, which are also enabled by default. Change-Id: I3f5343c2410fac50bec08b386defe22baf3df440 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Enable JavaScript touch eventsJocelyn Turcotte2014-09-121-0/+17
| | | | | | | | They are disabled by default at the moment, enable them conditionally to a touch screen being available. Change-Id: I5827fe2326b7bc019fa5613121d1cfa666608e52 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the same version scheme as other Qt modulesJocelyn Turcotte2014-09-112-11/+1
| | | | | | | | | | | | | | | | After trying to get rid of all private header includes, the last standing one is qplatformnativeinterface.h even though its name previously suggested that it isn't private. This would be a complicated piece to expose publically in a way both flexible and binary compatible, and is a task heavy enough to justify committing to follow Qt's release cycle. The QML import version remains to 1.0 and will be incremented the same manner as QtQuick itself does. Change-Id: I6fab5f229d9f79dbc7a3e82d65ad324020929863 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Remove unnecessary private header includesJocelyn Turcotte2014-09-1111-14/+10
| | | | | | | | Most importantly, get rid of QOpenGLContextPrivate::globalShareContext which will be removed before the final. Change-Id: I5796fa822d2962c21fd8b6d8d3c196686d536e3d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* init-repository: clean up upstream repository checkout even moreAndras Becsi2014-09-113-47/+23
| | | | | | | | | | | | | | Remove unneeded codepaths now that we can trust the git shasums found in the .DEPS.git file. No need for parsing and verifying remote branches, we can simply fetch the specified sha1 from origin. This patch also unifies the 'shasum' and 'ref' members of the Submodule python class since the 'ref' member can represent both chromium's version tag and the sha1s of the submodules, there is no need for a separate codepath for these. Change-Id: I1300b5b74f4d2e6984943570963b2f813b1b1679 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* take_snapshot: check if dos2unix is in the path before using itAndras Becsi2014-09-111-2/+6
| | | | | Change-Id: If696de316dd7b3b801ba46d1a54c37eafa901bf1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add --log-level switchPeter Varga2014-09-111-0/+17
| | | | | | | | | | | | | | | | | The --log-level switch sets the log level of the chromium messages. It affects the browser and web processes but has no impact on the Qt messages. The following levels can be set: 0 -> LOG_INFO 1 -> LOG_WARNING 2 -> LOG_ERROR 3 -> LOG_FATAL Log level 3 set per default (fatal messages are shown only) since lower level messages might be irrelevant for those who use QtWebEngine API. Change-Id: Ie2ba10718d3c86bbfe3d847471b3facb346be446 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the type of argument in FilePickerController::accepted() slot.Adam Kallai2014-09-101-6/+8
| | | | | | | | | The filesSelected QML signal is connected to FilePickerController::accepted slot but the type of the parameters were different. Change-Id: I36a33857b557797fc18699144c4d558d0e454cf8 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Do a minor update to Chromium 37.0.2062.103Jocelyn Turcotte2014-09-103-1/+3
| | | | | | Change-Id: Ie9334cc9cdd240b2f5ceea0e31d82258045ea18c Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Run dos2unix on all files when taking snapshotsJocelyn Turcotte2014-09-101-7/+24
| | | | | | | | | | | This fixes Qt's packaging scripts that use the --to-crlf switch of zip, which doesn't work when files already contain CRLF. The script now takes much longer to run and a progress indicator was added to the console. Change-Id: I459c0d95f67b40ab57ff3b337210847cc60debc7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Prepare scripts for the .103 snapshotJocelyn Turcotte2014-09-102-60/+6
| | | | | | | | | | | | Chromium is now relying on git for its releases and isn't creating release DEPS files anymore. This patch makes sure that we ignore any deps not starting with src/ to exclude the script repositories outside of the Chromium sources and it removes all the svn-related logic. Change-Id: I24b1839f919821382b8c5993c71251dbd6108d4f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Clean up the module root directoryJocelyn Turcotte2014-09-102-110/+5
| | | | | | | | | | | | This moves init-repository.py to tools/scripts since it should now mainly be used by Qt WebEngine developers after our integration with qt5.git. Also remove the README file since most of the information is no as relevant for the Qt module audience as it was for a labs project. Change-Id: Iad9f6582d0ec0834cdaf38d0551d24f2c273badf Reviewed-by: Andras Becsi <andras.becsi@digia.com>