summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Move the QPrinter and QtWidgets related code out of the PDFium wrapperMichael Brüning2016-11-251-0/+3
| | | | | | | | | | | This moves the actual printing using QPrinter to the WebEngineWidgets part of the API. The printsupport module depends on the widgets module and therefore QtWebEngineCore also had a dependency to widgets. This is removed by this change. Change-Id: If6e5745709a59de18f2123b930cbe6e64390c867 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Allan Sandfeld Jensen2016-11-251-1/+1
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ib9c9eca457c1c42dab948e6cb56d44b57d5da32a
| * Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-11-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/api/qwebengineurlrequestinfo.cpp src/core/api/qwebengineurlrequestinfo.h src/core/core_gyp_generator.pro Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
| | * Check if the .git directory exists before invoking gitAndy Shaw2016-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If .git does not exist then this is not from a git build and therefore there is no reason to invoke git (which might not even exist on the system anyway). This prevents an error appearing due to trying to invoke git on Windows when it does not exist. Change-Id: I8c0b5b237cfdaffdbb33efdd16cf20cd1560f1a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Add pkg-config test for system harfbuzz version on linuxMichael Brüning2016-11-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older harfbuzz versions like the one bundled with Ubuntu 16.04 cause crashes of Qt WebEngine applications. Use the bundled copy although Qt was configured with -system-harfbuzz in those scenarios. Task-number: QTBUG-56895 Change-Id: I8fad6754447ba32c3630e6772ca2ae6d4fd710c1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add support for compiling WebEngine with Clang sanitizer optionsAlexandru Croitor2016-11-221-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change pipes the already supported Qt sanitize options to Chromium, so the Chromium build system adds the correct compiler sanitizer flags. The change also checks whether the requirements to build a sanitizer enabled Chromium are met (currently works properly on macOS with an Apple clang >= 7.3.1, and on Linux with clang + libc++). Change-Id: Ibab2d5735935ddc92226575fc0e9f5912b807329 Task-number: QTBUG-52656 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add gn build files to take_snapshotMichal Klocek2016-11-161-2/+4
| | | | | | | | | | | | | | | Change-Id: I9da4f98c203dcaa41653dc1d00fcd34a1dd66b85 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add spellchecker feature to new config systemMichal Klocek2016-11-141-0/+1
| | | | | | | | | | | | | | | Change-Id: I35a5c815c9f2b3ebacb5991ba6645641b17db2db Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8Allan Sandfeld Jensen2016-11-111-0/+10
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-111-0/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h src/core/gl_surface_qt.cpp src/core/print_view_manager_qt.cpp src/core/web_contents_delegate_qt.cpp src/core/web_engine_context.cpp src/webengine/doc/src/qtwebengine-overview.qdoc src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/webenginewidgets.pro sync.profile Change-Id: I44495f4d899580c882d6b86d68d7f6b77c8e91f6
| | * | Give better error on unsupported platformsAllan Sandfeld Jensen2016-10-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for our supported and semi-supported platforms. Task-number: QTBUG-56465 Change-Id: Ic2f934ceac1b21ab5c688fa67e1c1a74ddf4a43b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Add out of source builds for ninja bootstrapMichal Klocek2016-11-111-16/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Instead of coping the src ninja files to shadow dir, do out of source build. Change-Id: I00c577e5def66c0415681deab63b7c7947a39200 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Start using new config systemAllan Sandfeld Jensen2016-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the optionproprietary codecs to configure.json, so it can be selected by the global configure, and is summarized there too. Keeps the old system for compat with building against older Qt. Change-Id: I5deba10f2e25445870cbdc7507155b0b76c307de Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | move invocation of (old style) configuration to top-level projectOswald Buddenhagen2016-11-083-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there doesn't appear to be a reason for magically invoking the configuration from default_pre/post, and it would cause problems further down the line with the new configure system. Change-Id: I3cf743a444e96bb397116f2ad4dce923f57aacfc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | move setup of QTWEBENGINE_ROOT to .qmake confOswald Buddenhagen2016-11-071-3/+0
| | | | | | | | | | | | | | | | | | | | | less effort, more standardized. Change-Id: Iee03d85b2d3fea2721a5271874b876f411ef8ce9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Doc: Mark generated license pages as attribution docsTopi Reinio2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows the Qt WebEngine licensing documentation to be listed as part of the output for '\generatelist annotatedattributions'. Change-Id: Ief91ec5f414c66a8a14c8b4e323cddac87837f58 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Improve configure outputAllan Sandfeld Jensen2016-10-191-27/+58
| | | | | | | | | | | | | | | | | | | | | | | | Format the output slightly more, and report the list of optional bundled and system libraries used. Change-Id: I1fd06a5a83fb01e93dfd29236774a6e320530a6e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Revert "Revert "Lower minimum OS X requirements back to 10.9""Liang Qi2016-10-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | fdf3a40 in qtwebview fixed the macOS 10.9 build issue. This reverts commit 41ba9b70525139fb52d00ba81eb8a53293ad71db. Change-Id: I178ba785500bf7d15f1b0b8319fe520d07f0388c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Fix spellchecking for macOSAlexandru Croitor2016-10-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change fixes spellchecking to work on macOS. A new WebEngine configure option is available to allow spellchecking on macOS to use either Hunspell like the other platforms, or the native spellchecker that comes with the OS. The default is to use Hunspell. Task-number: QTBUG-53135 Change-Id: I3e45b2e0d728b1bf2659c35f3d0a042b0ecd6239 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Revert "Lower minimum OS X requirements back to 10.9"Jani Heikkinen2016-10-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6e9779ac2c5b0d941bb415fb00e0f193d685457c. It seems there is an issue with 10.9 & Qt 5.8, see QTBUG-56563. Reverting this to be able to integrate qt5.git in '5.8' Change-Id: Ide35be544e81d31c3bcbd525bb43d3a864ce116c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Lower minimum OS X requirements back to 10.9Alexandru Croitor2016-10-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c8851dd1a77e730bc6a3c17b7c75b1a4c6b41f53, and allows building on OS X 10.9 with OS X 10.10 SDK. Change-Id: Id59b08424165272fd0d35418eef45a03fce731fb Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Update ChromiumAllan Sandfeld Jensen2016-10-042-1/+4
| | | | | | | | | | | | | | | Change-Id: Icf960eb9347e2f2f8a41bbfdb35636154fd4a382 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Update Chromium to 53.0.2785.117Allan Sandfeld Jensen2016-09-182-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The changes to take_snapshot.py were already applied in the last version but not reflected here. Change-Id: I34c3de85f5766790764349ef81b4fac2937e6ce2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Prepare for configure modularization in qtbaseLars Knoll2016-09-162-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we will find the features also after the modularization change in qtbase. Change-Id: I34d4eecbc51335c59e0e1d5d8de4149487fd07b6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Adaptations to Chromium 53Allan Sandfeld Jensen2016-09-142-2/+5
| | | | | | | | | | | | | | | Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Adaptations to Chromium 52Allan Sandfeld Jensen2016-09-141-3/+3
| | | | | | | | | | | | | | | Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Restore ability to build with Qt 5.7v5.8.0-alpha1Allan Sandfeld Jensen2016-08-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Defines the qtConfig() test for older Qt versions, and fix conflict between two QSGRectangle definitions. Change-Id: Icf4ef2f88d9e98e7aea4e88d777827bf69a4c281 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Do not use moc_predefs.hAllan Sandfeld Jensen2016-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We do not currently have a gyp action to generate the file, but fortunately we can tell moc it doesn't exist so we get the defines the old way. Change-Id: I001663d6638cb26a9d0d0307d8bfa4f3bf0ac59d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-232-5/+5
| | | | | | | | | | | | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-164-41/+4
|\ \ \ | |/ / | | | | | | Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-164-41/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| | * Explicitly disable the build on MirSimon Hausmann2016-08-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Unfortunately Mir is not supported yet, see EGL context retrieval code in src/core/content_browser_client_qt.cpp. Change-Id: Icade55c4c35f1a2a625479c31699d33853922087 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Remove libcap dependencyAllan Sandfeld Jensen2016-08-053-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | Chromium does not appear to use it anymore. Change-Id: I846fd869ffb15b832f208764fe8066f000187973 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-054-19/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-022-12/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| | * Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-272-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | Allow building WebEngine 5.7 on OS X 10.9Alexandru Croitor2016-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we require a python version greater than or equal to 2.7.6, to build WebEngine. But OS X 10.9 ships with 2.7.5. Lower the version to 2.7.5 to allow building on OS X 10.9. Change-Id: Ibd40d6afecf9ea8a8e4b31115fdf9b6d1368f0e5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Fix building on OS X 10.9 with 10.10 SDKAlexandru Croitor2016-07-012-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Fix python version checkJoerg Bornemann2016-06-221-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Chromium requires python version 2.7.6. Adjust the python version check accordingly. Change-Id: I988371a1c132e63f3c57b3aeacdc1a50a8cf2dce Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Raise minimum OS X requirementsAllan Sandfeld Jensen2016-08-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Chromium doesn't build out of the box with older XCode any more. Change-Id: Ib7241c8768a5fafcdaf4f9b63651028446749c9d Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Add back spellchecking supportMichal Klocek2016-07-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit: * d364c05de52f9ab39034e56cac4e0a7981dc541d * e507f140b70f464fb970d2f94357ac588dcc4f03 Moreover it fixes shut down of keyed services, updates versioning of and fixes spellcheck unit test context menu request, which otherwise fails on windows. Change-Id: I9bfc589544cb969abd6d2d7af69531b4c5c907b7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Update chromium to 51.0.2704.106Allan Sandfeld Jensen2016-07-012-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | Also adds some extensions and components we may need for upcoming features. Change-Id: I369915cec296bc96764476981f7ac7bfb4871045 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Require Windows 10 SDKAllan Sandfeld Jensen2016-06-281-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | We can not build without the Windows 10 SDK, so test if we have one before starting a build. Change-Id: Ib7b6ea3be6a228b4f9baaa15b3d11b79b70b90c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Merge branch '5.7' into devAllan Sandfeld Jensen2016-06-145-14/+17
|\ \ \ | |/ / | | | | | | Change-Id: I1ecb615b8df1303c27b6609970502920123b3610
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-314-11/+14
| |\ \ | | |/ | | | | | | Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
| | * Add qtlocation dependency to sync.profileAllan Sandfeld Jensen2016-05-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without qtpositioning from qtlocation source module, we have no support for geolocation. Also correct a false dependency on xmlpatterns, and adds a feature report on geolocation at configure time. Change-Id: I7d80b8288631401bf4c8aaa2541327a52910c3e6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Fix 'The command line is too long' errors on WindowsKai Koehne2016-05-303-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If all arguments are made absolute the system command line easily get's too long, which will lead to weird build errors later on. This can be easily worked around by resolving the path names on the callee side. Anyhow, we now have to make sure that the file separators are consistent. Task-number: QTBUG-53618 Change-Id: I1b28cc43dd890f6c9b723af9b70d2b2614651ba2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Allan Sandfeld Jensen2016-05-312-3/+3
| |\ \ | | | | | | | | | | | | Change-Id: I00f64f15ec2aee18d8e6c7b5f59dfae49be1cba8
| | * | Preserve paths with spaces in MOC_COMMANDKai Koehne2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem caused by change efd2ea8ea720 in qtbase. MOC_COMMAND now can contain paths with unescaped spaces, like /us/include "/Library/Frameworks (framework directory)" Splitting this just by space will lead to a broken moc call. Change-Id: Ic2875917059141ec82cf5f66243a357ac7ee0ba3 Task-number: QTBUG-53612 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Remove harmful spaces in qmake argument helpKai Koehne2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I47182d78f9dc8ecb8b4758f3ab739eaf88c04e24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>