summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* OSX: Don't show QtWebEngineProcess in the dockv5.4.05.4.0Jocelyn Turcotte2014-12-022-0/+25
| | | | | | | | | | | Set the LSUIElement key as Chromium does in its helper app's Info.plist to prevent seeing a jumping icon in the dock while the OS waits in vain for QtWebEngineProcess to create a window. Change-Id: I6c836621ec506fde04bc3825f64c49630a065351 Task-number: QTBUG-42955 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Disable using the ICU data file on embedded linuxAndras Becsi2014-11-241-0/+1
| | | | | | | | Since we use the system ICU we do not need the extra data file. This fixes a crash caused by missing icudtl.dat file. Change-Id: Ic7a6ad83d6595ea3a89c736c281499636b05945e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Use a relative install_name for QtWebEngineProcess' dependenciesv5.4.0-rc1Jocelyn Turcotte2014-11-201-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Until we can rely on Qt using @rpath on OSX, QtWebEngineProcess' dependencies must either be updated by macdeployqt when creating an .app bundle, either we must make that path relative at build time. Since QtWebEngineProcess.app is always deployed inside QtWebEngineCore.framework, we can safely assume that the dylib is always in a parent directory and that QtCore.framework can be found one directory higher. The additional dependencies of QtWebEngineCore.framework will be handled by the dynamic linker when it gets loaded, but this only works for QtWebEngineProcess when macdeployqt uses @loader_path instead of @executable_path (then relative to the application which is in a different directory than QtWebEngineProcess). This can be forced by passing a non-empty value for its -executable= command-line argument (e.g `macdeployqt Browser.app -executable=Browser.app/Contents/MacOS/Browser`) All this will be much simpler once we got Qt framework builds to use @rpath instead in a future minor version. Task-number: QTBUG-41611 Change-Id: Ied46c65a09f7033b622708da6e3d85855f9abf34 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Doc: Fix issues related to example docsTopi Reinio2014-11-175-2/+55
| | | | | | | | | | | | - Add documentation for Quick Nano Browser - Add all examples to the correct group - Add instructions to run the examples - Qt WebEngine Widgets index page: Add examples section Task-number: QTBUG-42668 Change-Id: Ie60f8708336b9c147d0c22afb555fe87287deddc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Add missing header guardsPierre Rossi2014-11-152-0/+8
| | | | | Change-Id: I67d0040c2e9f00e8a7b842ac1228212c0e93873c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Process touch events in sorted order.Zeno Albisser2014-11-121-0/+10
| | | | | | | | | | | | | | | | | | | We are mapping a single QTouchEvent to multiple MotionEventQt for Chromium. For gesture recognition it is important that these motion events are being processed in a sorted manner, as a move event might trigger a different gesture depending on how many ACTION_DOWN or ACTION_POINTER_DOWN were received before. It is particularly illegal to process an ACTION_MOVE with multiple touch points without having received a ACTION_POINTER_DOWN before. Change-Id: I75d22dd845774a14b5f590e0e0ce46263c4a49f4 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add a stub AccessTokenStore implementation.Robin Burchell2014-11-125-0/+122
| | | | | | | | | Callers inside Chromium expect an implementation of AccessTokenStore to exist. This fixes crashes with the geolocation-based APIs, exposed on e.g. google.com when faking an Android UA (as well as other places, probably). Change-Id: I45e6b483e096d5165fefd86927cdf34e799cc4d9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-121-2/+2
|\ | | | | | | Change-Id: I3b7df1ada08a8985734d804208b50cd5e0403903
| * Fix build in QWebEnginePage API testSzabolcs David2014-11-101-2/+2
| | | | | | | | | | Change-Id: I7cb497ce0f67eaf948caa88930fa1a3040ff4c39 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Disable accelerated 2D canvas rendering with ANGLEJocelyn Turcotte2014-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANGLE isn't thread-safe and we're already taking a risk by letting Chromium do texture upload from the GPU thread with a shared GL context. Any kind of drawing happening concurrently between the GPU thread and the Qt scene graph thread might currently end up drawing on the same device context and this is creating visual artifacts and Direct3D errors. We're already disabling WebGL but we should also disable accelerated 2D canvas rendering to lower that risk. We should ultimately disable ANGLE from within Chromium or fix multithreading issues to properly support GL rendering scenarios across threads. Task-number: QTBUG-41627 Change-Id: I37a7a778f0e1066a454f51bb38e98df4dea8767e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-1016-42/+71
|\ \ | | | | | | | | | refs/staging/5.4.0
| * \ Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-1016-42/+71
| |\ \ | | |/ | | | | | | Change-Id: I01615a492c958bf123deeef5d2ddf9fb01b1a9d0
| | * Cache to QStandardPaths::CacheLocationAllan Sandfeld Jensen2014-11-074-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | We should save our cache in the configured CacheLocation, and ensure we are prepared for multiple BrowserContext by caching to a Default subdir. This matches how chromium caches on linux. Change-Id: Ibe914fca35435ea1658565be87747cfabc71e97b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * Fix enum names of audio/video featuresAllan Sandfeld Jensen2014-11-074-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature enum names and documentation gave the impression it could control audio and video output, while they only control input. Also removed documentation of non connected feature permissions for Notifications and GeoLocation. Change-Id: Ia35142ca691ebd6059b7472e9803fda8cbd84813 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| | * Enlarge quicknanobrowser for qt.io.Friedemann Kleint2014-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The default size causes qt.io to look bad and is too small for high resolution screens. Change-Id: Ie417dde8ab32fc4897cd60c292afdc39b9213510 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| | * Add option to disable error pages in quicktestbrowserPeter Varga2014-11-051-0/+8
| | | | | | | | | | | | | | | Change-Id: Id2e62af31f1dc5268fe6b163d2fc0b671f5e491a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| | * Fix URLs in examples.Friedemann Kleint2014-11-045-10/+11
| | | | | | | | | | | | | | | Change-Id: I528b7c4c22a1c47f54fe1b78a9d781a6af9cfc6b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Fix spelling in browser example.Friedemann Kleint2014-11-041-1/+4
| | | | | | | | | | | | | | | Change-Id: Id54fd7ca704bd9456c98765afdbaf04e3d46b33c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Update snapshot sha1 to include various crash fixes for the release.Andras Becsi2014-11-101-0/+0
|/ / | | | | | | | | Change-Id: I2d04e910c7a08e1c630bc490d1f8b1be3d27a6f1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Disable error page while testing loadFail signal of Quick APIPeter Varga2014-11-062-15/+29
| | | | | | | | | | | | | | | | Error page should be disabled while testing loadFail signal since testing signals of the internal error page is not possible yet. Change-Id: I07f0bb6378fcbf5d18634197808801c94606803c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Fix crashes in QQuickWebEngineSettingsPeter Varga2014-11-061-0/+1
| | | | | | | | | | | | | | | | Remove QQuickWebEngineSettingsPrivate object's pointer from the global setting list before the object is destructed. Change-Id: I1cca6bf8aa2438903692d9e2ef863c8fc543adbd Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Deploy external data in QtWebEngineCore.framework for framework buildsJocelyn Turcotte2014-11-064-16/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no convenient way to deploy QtWebEngine into an application bundle on OSX. macdeployqt copies frameworks into a .app bundle's Frameworks directory but this makes no sense unless all the needed files are also distributed with the bundle. This patch moves: - The ffmpegsumo.so library into Libraries/ - Locale .pak files, qtwebengine_resources.pak and icudtl.dat into Resources/ - QtWebEngineProcess into its own .app bundle, itself into Helpers/ QMAKE_BUNDLE_DATA is used to copy files into the bundle while INSTALLS is used when installing normally. A LOCALE_LIST is explicitly listed since QMAKE_BUNDLE_DATA can't handle the * glob to match all source files. Change-Id: I5c0df57b4b9e93f9cce34a74a6e024bf90d37b5c Task-number: QTBUG-41611 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Move extra installs from core.pro to core_module.proJocelyn Turcotte2014-11-062-27/+26
|/ | | | | | | | | | core_module.pro is the one responsible for deployment of the binary so it makes sense to also let it handle the other files to install. This leaves core.pro to only handle sub-projects dependencies. Change-Id: Ibe433eceec7fb0a9f806dfa89dccb0bedeaccc59 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Optimize the QMatrix4x4 after a conversion from SkMatrix441.0Jocelyn Turcotte2014-11-031-1/+3
| | | | | | | | | This avoids using a General matrix for tile transformations which are usually only translations in our case. Change-Id: Ic947d7ef9b78de6d5d16ea718cc03255e38a8097 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Print a more descriptive warning when a build is skipped.Michael Brüning2014-10-291-1/+8
| | | | | | | | | This should help users understand which prerequisites are missing from their system and may also help find invalid CI configuration quicker. Change-Id: If564825c11782b6e760f016893010008d9a551fa Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add runJavaScript testAllan Sandfeld Jensen2014-10-291-0/+68
| | | | | | | Adds a test to check the return types of runJavaScript. Change-Id: Ifd0cb4adf57c972e8a8ad240d51f11f0cc17aa3d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update chromium submodule after adding fixes for MacOSX10.10.sdk.Zeno Albisser2014-10-291-0/+0
| | | | | Change-Id: I935ee10d10248ab525aca31c1b1c04d2927915c1 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fixing quotation mark usage for WindowsAdam Kallai2014-10-291-2/+2
| | | | | | | | | The Windows command shell try to interpret the single quotation mark as a command. Change-Id: I4dc4382bdbe0c90565f6ac56c33a80971669344c Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Support Qt::AA_ShareOpenGLContextsPierre Rossi2014-10-291-4/+13
| | | | | | | | | | | | QtWebEngine::initialize happens after QGuiApplication instantiation, so it is too late to simply set the application attribute. In that scenario, we don't want to override the shared context and risk a double free when both QGuiApplication and our cleanup handler try to delete it. Change-Id: Id52884abbb0c2380208876d9c00e8ddbfbc21eda Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Make url handling consistent in widget and quick APIPeter Varga2014-10-287-10/+14
| | | | | | | | Use explicit url in quick API too and use GetLastCommittedURL instead of GetVisibleURL for getting the expected urls in tests. Change-Id: If3251323645979643f3dc0e16491fe35b584f51c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the correct comment syntax.Michael Brüning2014-10-281-1/+1
| | | | | | | | This fixes 7639513f94fe45b5202349d2891e46b2295606a0. Change-Id: I512ca97d8b4fc8b7c48f03ab32d476bb3a791157 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix tst_QWebEngineFrame::setUrlHistory expected failuresPeter Varga2014-10-281-17/+26
| | | | | | | | Adapt test results to the chromium behavior and remove expected failures. Change-Id: I277462125822e50f84c0d0ae795846a71c9a2b10 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add checks for python and GCC versions.Michael Brüning2014-10-281-0/+16
| | | | | | The GCC version check is only run on Linux. Change-Id: I524508d763005190764526ce337dc348e5ba4fcb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Display error if building for ARM architecture older than ARMv6Jonathan Liu2014-10-271-0/+1
| | | | | | | Chromium is only supported on ARMv6 and ARMv7 for ARM architecture. Change-Id: I0493c9ba2baf4a537f759286622056093c0d4a25 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Enable build on all supported linux platforms.Michael Brüning2014-10-211-1/+1
| | | | | | | | | | The build did not work when configuring to linux-g++-64, although the platform is supported. Task-number: QTBUG-41918 Change-Id: If2c8a5722d7d6b0ca28a99763531d8ffd9534de7 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Disable geolocationSzabolcs David2014-10-162-0/+24
| | | | | | | This prevents the crash when a webpage requests geolocation permission. Change-Id: I7331b869ec1439d678cee7941691289220718f3d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Look for the NINJA_PATH env var and prefer that over the bootstrapped ninjaJarred Nicholls2014-10-161-4/+9
| | | | | | | | | The snapshot ninja may cause issues in some environments, where a different ninja version may work. If the user has NINJA_PATH set in their environment, prefer that over bootstrapping our own. Change-Id: I4c6d2f479aeae1f5137705ed2deb995b59ea287a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Allow building on boot2qt.Zeno Albisser2014-10-162-1/+1
| | | | | Change-Id: I91ce455ac5e3992e50d13c14f4035f91baad85bf Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add plugins.qmltypes for WebEngine APIMichael Brüning2014-10-151-0/+164
| | | | | | Task-number: QTBUG-41952 Change-Id: Ic21089a34364696c8ff7e68e397e39f8f0b7f5cc Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Include QMAKE_CC when extracting C compiler flagsJonathan Liu2014-10-151-1/+1
| | | | | | | | | This fixes cross-compile settings detection for cross-compilation environments where the C compiler cross-compilation flags are set in CC/QMAKE_CC instead of CFLAGS/QMAKE_CFLAGS (e.g. OpenEmbedded). Change-Id: I0a7b0f6c47a00775ec18073a16359c8351363285 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix ARM NEON detection for -mfpu=neon-vfpv4Jonathan Liu2014-10-151-1/+1
| | | | | Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix up coding style in GetNavigationErrorStringsPierre Rossi2014-10-142-28/+26
| | | | | | | | That code was borrowed straight from Chromium and used the Chromium coding style. Change-Id: I212aea23f19056b901cbc770640faed4998f02fd Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add setting ErrorPageEnabledAndras Becsi2014-10-1411-4/+43
| | | | | | | | | This is required so that embedders can implement custom error pages, and is also needed for tests, where error-page loading has side-effects on subsequent page loads. Change-Id: I5ae276a58864a2fa9d7b608bea3340b482a92f4e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Disable Desktop Notifications.Michael Brüning2014-10-141-0/+1
| | | | | | | | | This should be removed once desktop notifications have been implemented. Task-number: QTBUG-41893 Change-Id: Ia004ee8946ae4441027161f5dddf05d304df8b1b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the shared waitForSignal method in QQuickWebEngineViewGraphics testSzabolcs David2014-10-141-15/+2
| | | | | Change-Id: Ie27e4af5f4517bb1e1eea1262ab32140b3dff816 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Import QQuickWebEngineView API testSzabolcs David2014-10-1413-3/+729
| | | | | | | | Add crash tests for the Quick API and mark the unimplemented features in the test logs. Change-Id: I8e6b322fb1bb5ed75fed8b9556e2e975c9227f0a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix localization on OS XAndras Becsi2014-10-133-18/+1
| | | | | | | | | We did not load any localization data on OS X until now, so the error page did not have any strings, and some tests asserted because of missing localization. Change-Id: Icb6de1f7e3aaa6815483d379efaf00e8ed6a1dbf Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Do not run Callback for already canceled URLRequests.v5.4.0-beta1Michael Brüning2014-10-101-0/+3
| | | | | | | Doing so causes a check to fail in URLRequest::BeforeRequestComplete. Change-Id: I487042b922b3f357bd8d9579167d9b372963ff29 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Bounds check the zoom factor before we pass it along.Pierre Rossi2014-10-101-0/+2
| | | | | | | As it turns out failing to do so can mess up the page state. Change-Id: I8cc785b01c73bde5443bdb78554d7b3809d96afe Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Revert "Allow more generic platform names for linux based platforms."Zeno Albisser2014-10-101-2/+2
| | | | | | | | | We need a better solution to find out if we are building on a 64bit system. This reverts commit 58806890b496aef7c2880e651a8bb73b090cd72a. Change-Id: I43c48b5cbc5e96f93b65165b0445670a832b0206 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
View Lorry Controller Status