summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7.0Michael Bruning2016-05-231-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
| | | * Remove fake dependencies in embedded linux buildsAllan Sandfeld Jensen2016-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing embedded Linux builds we do not use X11 libraries. Change-Id: I704d8fd4853e2187590bc9513f55b7ec61c9c4bd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Update Chromium to 51.0.2704.79Allan Sandfeld Jensen2016-06-022-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds a url_pattern files from extensions. Change-Id: Ief1b7faea488f1e6b5c3688377f630ff1b3e8592 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Update to Chromium 51 snapshotAllan Sandfeld Jensen2016-06-012-47/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also inverts the logic for components and tools, so we include everything not explicitly excluded. This makes it easier as Chromium keeps moving features into components. Change-Id: I7232868c777ddcc45efaa496182706de3e850b0c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Do not try to build using MSVC 2013Allan Sandfeld Jensen2016-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium requires MSVC 2015 now. Change-Id: I9cf58cf03358167e6ce41e0fb2d7669afdf29a15 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-272-0/+14
|\| | | | | | | | | | | | | | | Change-Id: Ieac8a52a2942ed72eaea432a344deeec28da2ed6
| * | | Document licenses in Qt WebEngineKai Koehne2016-05-232-0/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the licenses users of Qt WebEngine have to accept. qtwebengine-3rdparty.qdoc is generated using licenses.py: cd src/3rdparty; python chromium/tools/licenses.py --file-template ../../tools/about_credits.tmpl --entry-template ../../tools/about_credits_entry.tmpl credits >../../src/webengine/doc/src/qtwebengine-3rdparty.qdoc Task-number: QTBUG-51812 Change-Id: I568cf592054adb29dad07d43f3685c78cf7b8196 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devAllan Sandfeld Jensen2016-05-102-1/+15
|\| | | | | | | | | | | Change-Id: I02117cbd7ad655005b70daa97fd9db7b0918a5d1
| * | Remove spellchecking supportMichal Klocek2016-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Spellchecking API needs a bit more reviews and love. Current API is not intuitive and partly broken. Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Provide a debug version of QtWebEngineProcessJoerg Bornemann2016-05-041-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never shipped a debug version of the QtWebEngineProcess executable. This is problematic in debug_and_release builds when a debug application starts the release version of QtWebEngineProcess. The Qt libraries will then be loaded twice, in debug and release. Also, in development setups where only the debug libraries are deployed, the release version of QtWebEngineProcess cannot be loaded. Task-number: QTBUG-49493 Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devAllan Sandfeld Jensen2016-05-044-40/+111
|\| | | | | | | | | | | Change-Id: I8d3ed9c067ef5e6199d6cffcb41453d6f92f5cba
| * | Get additional sanitizer dependencies from upstream chromium.Alexandru Croitor2016-05-033-37/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buildtools directory contains custom libc++ libraries, which are a second-level git submodule (the first-level being the buildtools submodule, and the supermodule being chromium itself). The init_repository.py script does not support checking out submodules recursively, thus leading to the mentioned libraries being skipped. This change adds a hardcoded addition to make sure the buildtools submodules are checked out when init_repository is run, as well as support for copying all nested files in the submodule tree, when the take_snapshot script is executed. Thus it copies all necessary sanitizer dependencies. Change-Id: Icb5cf5b52c3d0a83c4690fb7d641cee4f5dc1132 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-291-3/+3
| |\| | | | | | | | | | Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
| | * Fix hint to use WEBENGINE_CONFIG+=Kai Koehne2016-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | At least on Windows/cmd.exe you can't put spaces in the argument. Change-Id: I55767a23409403b695e225339f86daae2dea1dc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-122-3/+3
|\| | | | | | | | | | | Change-Id: I939fc07c7e09c5598adb9f49bf6038daa2d871dc
| * | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-2/+2
| |\| | | | | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| | * Use system NSS only for certificate handlingKai Koehne2016-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Update Chromium to 49.0.2623.111Allan Sandfeld Jensen2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Pulls in SHA based on updated Chromium Change-Id: I1d9125fdfa355344914dadc4eab7fef1c53dfc40 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add script to deploy examples on WindowsPeter Varga2016-03-231-0/+393
|/ / | | | | | | | | | | | | | | | | Configuring windeployqt command line arguments might be inconvenient sometimes. This script uses qmake to query the necessary settings and uses the policy of QtWebEngine directory structure to find examples. Change-Id: I182928fa294de73eba2f49546c635f9a147d352a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Michael Brüning2016-03-221-0/+3
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| | * Check for presence of the qtwebengine-chromium submoduleJoerg Bornemann2016-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | People repeatedly tried to build QtWebEngine without checking out the qtwebengine-chromium submodule. Let's yield a helpful error message if the submodule isn't present. Change-Id: I9bf607e7a21e6e79c83bcd4afc81c63ae83e1ed6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Make isMinOSXSDKVersion() test reusable for different versions.Alexandru Croitor2016-03-221-12/+17
| | | | | | | | | | | | | | | Change-Id: Ibce28bfce855942b8c5675b6e34c85d837cb6255 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add option to allow compiling WebEngine as Mac App Store compliant.Alexandru Croitor2016-03-221-0/+7
|/ / | | | | | | | | | | | | | | | | When the option is enabled, a GYP variable is set that will result in removing private API calls in Chromium. Task-number: QTBUG-51072 Change-Id: If8835ce74bf5db94c17b68ebeb396cae9cc10553 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update to Chromium 49.0.2623.91Allan Sandfeld Jensen2016-03-092-1/+2
| | | | | | | | | | Change-Id: I43c545d1600bebabf6b94209beb91b3d3c4cd244 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Require OSX SDK version of at least 10.10.3.Alexandru Croitor2016-03-081-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | Chromium 49-based uses new OSX API which was added in SDK 10.10.3. Make sure not to allow compilation in case the SDK version is lower than that. This also reverts commit 70ed3812fbe5eee6f62ddb26251f46061b0d3675 to allow compiling on OSX 10.9, with an appropriate SDK. Task-number: QTBUG-51350 Change-Id: Ib6dab0a1e16734cda9429363c90d2c8b8838d833 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 04:05:36 +0000