| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
The tools/qmake directory is a left over from webkit where qmake was
but one of many buildsystems. This is not necessary for qtwebengine, so
we can instead use the standard locations.
Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After configuring Qt there will be an error message if a suitable python
version could not be found.
Add python2 configure test that
- first looks for python2 in PATH
- then looks for python in PATH
- checks the Python version
- stores the result in QMAKE_PYTHON2
Use $$QMAKE_PYTHON2 everywhere where we call python.
Pass $$QMAKE_PYTHON2 to gn for its exec_script feature.
Task-number: QTBUG-60164
Change-Id: I33de1273cbd20a787b3c8889d35280784dbcd5ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
| |
Change-Id: I8d59ccc5967193db55ac00410f09506a3b040dfe
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
| |
The code that gcc 4.9.1 stumpled on was rewritten in Chromium 56, so
we should try and let compiler build webengine again.
Change-Id: I9ccec7e93aaa384aefdf338e3822b78e0dc494f2
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We never saw the same failure with gcc 4.8 debug builds with 55-based,
and the other failure suspected to related turned out not to be and
have been fixed.
So try to re-enable gcc 4.8 debug builds, and other old platforms but
explicitly disable gcc 4.9.1 which fails to compile Chromium.
Change-Id: Ib0a8ac33aafbd12d31e374dfd23f056b4ba1adf0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Do not check for exactly MSVC version 14.0 but compare if the actual
version is less than the requested version.
Task-number: QTBUG-58826
Change-Id: I249ed3c697ccb911784a83463b1c23185c9b3856
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Adds GN versions of the gyp_configure targets, to create custom
toolchains we can use to override compilers used by GN.
Change-Id: Ic3a9cb7e83f845180396faff632f72f9c24f3365
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
The simplest adaptations to API and build changes in Chromium 55
Change-Id: I923fa188690a04902492317807f72f006bcab9c6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Skia does not mark inline functions used in optional arch cpp files with
always_inline, which means they can be un-inlined and end up as in the
object files where the linker will pick one at random without knowing
some of them are compiled with optional arch features.
Task-number: QTBUG-59154
Change-Id: I8495e04550898b093ab39c4dc0f37ad6e8948864
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix release and debug builds. Refactor ninja and gn
builds as a sub projects, these are only build as release.
Call core_generator and gn_run separately for debug and
release builds.
Change-Id: I638023214cdc98a5101d190486452cc4a1229486
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ic36a80502730d404ab96dfa11ff1eb0ac6eb302d
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Skip build if WindowsSDKVersion environment variable is not set at all
(e.g. if vcvarsall has not been called), or if it is is set to "\"
- this can happen if vcvarsall.bat did not find a Windows SDK.
Task-number: QTBUG-58363
Change-Id: Ieb73986a26d0b8fa28a8caa7702b830f4fb4b216
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit uses gn instead of gyp to build on desktop
linux.
Use WEBENGINE_CONFIG+=use_gn to use gn during the build
instead of gyp.
Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I30c5a7ede2fa94fda1509443f486d05bea8b9652
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Bootstraps gn wihout rebuild.
Change-Id: I09ee4d6b6f458f16f0d9ac18433823153ab75995
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty
Change-Id: Ie7b7c469aa24716816a23b8fe7a8df9f477a9f67
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty
Change-Id: Ib9c9eca457c1c42dab948e6cb56d44b57d5da32a
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/core/api/qwebengineurlrequestinfo.cpp
src/core/api/qwebengineurlrequestinfo.h
src/core/core_gyp_generator.pro
Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Small refactor to split the targets in makefile.
Bootstrapping gn will need also ninja build.
Change-Id: Id177a0189b79cf353b6bd27c4e087f4e960f56c2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Adds system-ninja feature, which is enabled if
ninja is found in system path.
Change-Id: Icc58bc252d67a27f80c139349be28f9fd239108a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\ \ \ |
|
| |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | | |
Change-Id: I1ecb615b8df1303c27b6609970502920123b3610
|
| |\|
| | |
| | |
| | | |
Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| |
| |
| |
| | |
Chromium requires MSVC 2015 now.
Change-Id: I9cf58cf03358167e6ce41e0fb2d7669afdf29a15
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ibce28bfce855942b8c5675b6e34c85d837cb6255
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
We keep running out of memory during linking and must skip building on
32-bit architectures until that problem is solved.
Change-Id: Ib0b465cb033df0112133eb256adeb498d260da7f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
| |
We might be able to get xcode 6.0 on OS X 10.9 working with
an 10.10.3 SDK, but for now we just require 10.10 and a newer
xcode.
Change-Id: Ibeb068e9993b3709a1fd74370d7892718a108ab1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|