summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Liang Qi2015-05-251-0/+0
|\ | | | | | | Change-Id: I837d349b9ee508be3ebf9990b0ad039a53341b77
| * Update chromium branchv5.4.2Allan Sandfeld Jensen2015-05-211-0/+0
| | | | | | | | | | | | | | | | Pulls in the recent security fix. Change-Id: I1dac6591c11445619518334d530e9dd8d408a541 Task-number: QTBUG-46261 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Bump versionOswald Buddenhagen2015-04-201-1/+1
|/ | | | Change-Id: I9e0f98316bc1ba4fd5ee73c6991e4599704e3317
* Update submodule SHA1Michael Brüning2015-03-161-0/+0
| | | | | | | | This includes the fix for the SIGPIPE handling. Task-number: QTBUG-44689 Change-Id: If418da89620c6ec87240d0264901dd23c1881310 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update links from qt-project.org to qt.ioSergio Ahumada2015-03-061-3/+3
| | | | | Change-Id: I0882a82457eaef37e84f81ad3bc44e1d65cec4ef Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Update chromium SHAAllan Sandfeld Jensen2015-03-061-0/+0
| | | | | Change-Id: Ib9812da6bf5fc504fe5997ea9fd62ccae960d132 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix non-accessible build without -fpermissiveStephan Binner2015-03-051-2/+0
| | | | | Change-Id: I0279f26374070614cf8df0e6601b17e5b01b3be6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Enable building Qt WebEngine without accessiblity enabled.Stephan Binner2015-03-0418-5/+73
| | | | | | | | | | | | | | This adds guards that for QT_NO_ACCESSIBILITY being not defined around the code that uses accessibility types. It disables the quicknanobrowser and quicktestbrowser examples which need Qt QuickControls, which has a hard dependency to accessibility being enabled. Backport of d95b9295c970401939d2779cbdc9e2a8c7965277 from 5.5 Change-Id: I2a2a0a6196fcb3baa39603d9c929183b454f39ed Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix compiler detection and let Qt decide if examples should be builtAndras Becsi2015-03-042-9/+2
| | | | | | | | | This fixes the build on OS X if the path to clang is not cached, and only builds examples if Qt was configured to do so. This has already been fixed in dev. Change-Id: Ia2d17f38f30e832425f6e1cd014b46a6c6ae78ec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-03-021-1/+1
| | | | | Change-Id: If9f4b7bcfa4bfffffd5180600981ca0f16f6da8f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-103-10/+14
|\ | | | | | | Change-Id: I484a058c08be04a87d2f84514193fb58e772246b
| * eLinux: build ffmpegsumo as well.v5.4.1Zeno Albisser2015-02-021-1/+1
| | | | | | | | | | | | | | This will only contain free codecs. Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Also run the rejected signal handler when closing prompt dialogs.Michael Brüning2015-01-201-9/+12
| | | | | | | | | | | | | | | | | | | | The prompt dialog inherits ApplicationWindow, which emits the signal "closing" when the window gets closed by pressing the X button. Change-Id: I23e5cf6f8e81251869d765d7fd2864257f3c0b89 Task-number: QTBUG-43902 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Merge 5.4 into 5.4.1Oswald Buddenhagen2015-01-1613-38/+145
| |\ | | | | | | | | | Change-Id: I772c9710d8b01efd385a54e5f642ae2b62702a0e
| * | Fixed build when doing arm cross compilation without --sysrootDominik Holland2015-01-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise gyp will use it's own sysroot (which doesn't exists) if you are doing a croos-build without using the --sysroot configure option Updates the src/3rdparty SHA1. Change-Id: I450eaf95c50b3cf5dd2ad553bd363481def511fd Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * | Respect the pulseaudio configuration from Qt.Michael Brüning2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | It was previously ignored for Desktop Linux. Change-Id: I214171d222a5e7e0ee64afde225a742adbda4adf Task-number: QTBUG-43387 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Ensure QtWebEngineProcess is built in release modeAndy Shaw2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If debug_and_release is set then QtWebEngineProcess should be built in release mode as it is a separate process and when it is deployed later it will be in the right mode already. Change-Id: I377baa20f01b70db91a7a1cec5f1014b44780546 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/ |/| | | | | Change-Id: I4512b4e938c8010a4ed8d22829738887893b1e14
* | Add additional dependency checksPierre Rossi2015-01-161-1/+9
| | | | | | | | | | | | | | | | | | For dependencies that have caused trouble before, such as libdrm. Task-number: QTBUG-41516 Change-Id: I0cee98282e93460971471796a65a43be4750c6b0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Refactor our build skipping logicPierre Rossi2015-01-167-29/+118
| | | | | | | | | | | | | | | | | | | | Move the logic to mkspecs to keep the .pro files robust. Add the basic infrastructure for config.tests, the first one of which will consistently ensure we have libcap on linux. Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fixup sync.profilePierre Rossi2015-01-151-4/+4
| | | | | | | | | | | | | | We shouldn't hardcode to a particular branch there. Change-Id: I9cab855363cfaaa3d8d31879b0c459697a4a6f4c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Print only major.minor.micro version of python.Zeno Albisser2015-01-151-1/+1
| | | | | | | | | | | | | | | | This will avoid printing the compiler version python was built with. Showing the compiler version led to confusion multiple times. Change-Id: I4ced2128b92c83a41f616bcf756f2c313a9caed3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Use paths relative to QtWebEngineProcess on OS X.Michael Brüning2015-01-151-2/+12
| | | | | | | | | | | | | | | | | | Fixes crashes of the QtWebEngineProcess on OS X 10.7 that were caused by the bundle paths not being returned correctly. Change-Id: Ic839978a6f1bff361cb76a3468bf978a738b6e82 Task-number: QTBUG-43181 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Make TLS1 the default minimum SSL protocol in Qt WebEngine.Michael Brüning2015-01-131-0/+0
| | | | | | | | | | | | | | | | | | | | This mitigates the risk of the POODLE vulnerability. Updates the 3rdparty submodule SHA1. Change-Id: I7557ecfd5f4f250a51e18432936b83502ba5d272 Task-number: QTBUG-43085 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Revert "Mac: INCLUDEPATH fix"Simon Hausmann2015-01-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7da7f8ab00e6fe246ff8a02082305ea7f833fd3. Adding the install prefix to the inlude search paths causes us to pick up header files from there if there are any, which causes all sorts of issues. Conflicts: lib/lib.pro shared/shared.pro Change-Id: I070ff6443bb5612b3b7e3878d22dc9dd69d62e70 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Tell the ContentMainRunner to not reset signal handlers in the browser process.Michael Brüning2015-01-082-0/+1
|/ | | | | | | | | | | This prevents problems when QProcess::waitForFinished is used from the same application as QtWebEngine. Updates the src/3rdparty SHA1. Change-Id: I373456b1ef9f65e55b89acd877b15e7115516d6b Task-number: QTBUG-42747 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Only deploy ffmpegsumo once in debug_and_releaseJocelyn Turcotte2015-01-071-51/+53
| | | | | | | | | | | | | | | This moves all installs inside the the release-only-with-debug-fallback block to prevent the debug ffmpegsumo.dll to overwrite the release one on Windows (and get use for both debug and release builds). This will use the release version for both instead by default. This also moves the load(qt_module) call higher to make sure that build_all is added to CONFIG at that point. Change-Id: I2584a28e5eaaf5028798703fb387ac2b120d7ea9 Task-number: QTBUG-43348 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Remove possible quoting charactersStephan Binner2015-01-071-2/+3
| | | | | | | | qmake may have quoted already because of certain characters like ~ in build path Change-Id: I8a085d23da3da8876f3acd807c9468fc43c7dacb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* UIDelegatesManager: Remove creationContextForComponent.Robin Burchell2015-01-062-15/+6
| | | | | | | | | This doesn't seem to be too much sense, and according to the QQmlContext documentation, may not work as expected: "This is only valid for components created directly from QML." Change-Id: I49db5dad49288d196e8519b1a60dcf2192147672 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* UIDelegatesManager: Communicate load failure back to the dialog controller.Robin Burchell2015-01-061-1/+5
| | | | | | | | | | | If the dialog controller has asked to show a dialog, then if we cannot show a dialog, we should reject its request. Not doing this results in the WebView becoming frozen for input if the load fails, seemingly. Change-Id: I7dddd5357c712f896499cdebb142e60b5e80b4f2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* UIDelegatesManager: Always print errors if component loading fails.Robin Burchell2015-01-061-3/+3
| | | | | | | | | | | This setting is useful when developing a new UI set, and one may not initially know about the suppression of errors, which is a painful problem to run into. Furthermore, make sure to delete the failed component so that subsequent attempted use of it doesn't succeed if UI_DELEGATES_DEBUG isn't enabled. Change-Id: I3d2abc19fb4a007d06795d2e8149ae78d7c9c020 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2015-01-022-0/+25
|\ | | | | | | Change-Id: I155088b491e86d12eccf3c131acf9aad2dfd2a14
| * OSX: Don't show QtWebEngineProcess in the dockv5.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>
* | Use QDir::separator() where paths might be generated for WindowsAllan Sandfeld Jensen2014-12-151-2/+2
| | | | | | | | | | Change-Id: Id7afc11cd58f671ff5ce629cfc29bdb6d9567dc2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Enable cmake config files generationJocelyn Turcotte2014-12-125-6/+24
| | | | | | | | | | | | | | | | | | As QtWebEngine now uses 5.x as its version number, we can just provide cmake tests and let qmake scripts do the rest. Task-number: QTBUG-42073 Change-Id: I28ccddbd1849980074dfbeefb5cb5a70c9209ab1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: Id56d08a3b3192c63ee6d2f56cee8085ed41ac666
* | Force active focus for touch beginAndras Becsi2014-12-081-0/+2
| | | | | | | | | | | | | | This fixes the focusing issues on touch devices. Change-Id: I26c0080ea70aeabbd608e15fbd3705b907bdb68e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Check for EGL_KHR_fence_sync instead of EGL_KHR_reusable_syncAndras Becsi2014-12-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | We create an EGL_KHR_fence_sync on the chromium thread but try to verify if the wait function implementation is available by testing for the EGL_KHR_reusable_sync extension in the scene graph thread. Since the latter extension is not supported by most of our devices, we never actually waited for the rendering to finish. Change-Id: Ied829d4035d42899cfb3f86de018bc48e61c0cc0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Add a stub QuotaPermissionContext implementationSzabolcs David2014-12-042-0/+17
| | | | | | | | | | | | | | | | | | | | This prevents the crash when the application requests persistent storage access using the Quota API (e.g. on http://codepen.io/matt-west/full/CrfKh). The request has been disallowed for now, because it should rely on user permission. Change-Id: I4ae057c9485d3f06f45a637c7eeda9dd69fe6b54 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add class and enum documentation to QWebEngineCertificateErrorAllan Sandfeld Jensen2014-12-031-0/+33
| | | | | | | | | | | | | | | | | | Without the class description the methods documentation was never generated. Change-Id: I0d7232e8f5cc6765908cb28b77d0fe0f514d359d Task-number: QTBUG-42996 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Flush UI message loop before quittingAllan Sandfeld Jensen2014-12-021-0/+4
| | | | | | | | | | | | | | | | | | Cookies were not flushed on application exit because objects deleted lazy on the UI-thread never had their destructors called because we did not flush the queue on exit. Change-Id: If53cdb5547e15a9f39de8b99b1da313e307b1c90 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix deployment problems with developer buildsPeter Varga2014-11-284-2/+47
| | | | | | | | | | | | | | | | | | | | | | This fix deploys the following files into qtbase without make install: - qtwebengine_resources.pak - translations/qtwebengine_locales/*.pak - icudtl.dat - plugins/qtwebengine/libffmpegsumo.so Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Andras Becsi2014-11-2724-50/+383
|\ \ | |/ | | | | Change-Id: I2c48688f5f034233660bd7891693f81525fc1d6d
| * 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