| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Running setup_mount will ensure that every build uses it's own
cygwin and prevents mixup with other instance.
Update 3rdparty's shasum.
Change-Id: Ic8f25ce7c6077318bac36b15cfe23a5a27ed51b9
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I49415512d9eb152a2c9a20bcc5adf9065717b124
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
SurfaceFactoryQt::loadEGLGLES2Bindings is needed to find
and load EGL and GLES2 libraries on embedded linux.
It also provides a function to query the native display.
We are using qmake variables at compile time to detect
where we should look for the libraries at runtime.
For EGLFS we query the native display through PlatformNativeInterface.
If the resource is not exposed by Qt (pre 5.4),
then we assume EGL_DEFAULT_DISPLAY, which is the right
parameter for close to 100% of the cases anyway.
OzonePlatformEglfs is just boiler plate code.
Change-Id: I3ad08a56c50d6160be653ffb168b3f1f791e5245
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
Extend extra_os with Windows in git_submodule script.
Update blacklist in take_snapshot script.
This also updates take_snapshot.py for branch 1750.
Change-Id: Ie8a1e58534e9f5c2635ed4103d0ae62f804dd5d0
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
| |
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
|
|
|
|
|
|
| |
Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
| |
Change-Id: I179093362c550479361fe63680818dcd7d8a462a
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is in preparation of updating to the new stable branch 1750
(Chromium version 33.0.1750.x)
Move the sanityCheckModules function to version_resolver.py and
check if the parsed svn refs exist in the remote git repository.
If they do not exist fall back to the git shasum we parsed from
the .DEPS.git file.
This patch also removes the unused parseFile function.
Change-Id: Ie0c11fdd9326ee87e9dcc670c0a7c26f9a498fd5
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We cannot enable tcmalloc as otherwise we would
have to use it for all of Qt as well.
If we allocate with tcmalloc and free without
(or the other way round) this leads to errors.
Specifically it led to something that looked
like a double free corruption on embedded linux
for an event that is created in qtwebengine code
but deleted within Qt.
Change-Id: Ia8c8da09e78968648046761e34f7f674769cfdc2
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Always bootstrap and use the bundled ninja to avoid incompatibilities
between our bundled gyp and the system ninja, which might be quite
old.
This patch also removes the ninja location caching, as updating the
cache would trigger a re-run of qmake and gyp on all the project,
while the benefit of using the cache in this case are low.
Change-Id: I843cbe20e1153caecbda00ab3d45a34d560b2423
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This makes sure that gyp_run.pro follows the same behavior as
core_module.pro and that ninja is run for each config, in the
appropriate directory.
A special .NOTPARALLEL make fake target is added to avoid running
ninja for both configurations in parallel (this would cause build
failures). This target will be ignored by nmake, but might cause
issues if trying to build with jom.
Change-Id: Ibaa5f6aa4972cb24c83cc7a63e496938a5c16a3f
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The gyp/ninja build is moved from out/(Debug|Release) to
src/core/(Debug|Release).
The ninja build as well as generated gyp files and python
intermediate files all stay in the source tree for the moment.
Change-Id: I6948380c45896540fe508238ceef9fe48e41f5af
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead make sure that the QT and QT_PRIVATE variables are identical
in both core_gyp_generator.pro and core_module.pro, the former for
compilation and the later for linking.
This allows working around issues of qmake when handling -l switches
in libs. Some features on Windows append version numbers, while this
is not done when linking to Qt libraries via the QT variable.
Change-Id: I04b58a313335daeffc9510471553517c63908852
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This would prevent QWebEnginePage to be subclassed in applications
built with RTTI enabled. We don't need this anymore since all classes
inherited from exported core classes are pure virtual and completely
defined in their header.
Change-Id: I4ce19f893626e9bcb5cd4b11b7264e43ddcbac31
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
If QMAKE_FRAMEWORKPATH is empty, this would add an empty entry to the list
and would end up with a -F with no argument added to the clang command line.
This would fail the build since the next switch would be eaten by the -F.
Change-Id: I42657e781278fd56d6664a42fb4222eb83b3cd73
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
BUILDING_CHROMIUM define have to be moved to the related project
in core from default_pre.prf. Otherwise dllexport would be used
instead of dllimport while linking to webengine and webenginewidgets.
Change-Id: Ifed117f420591dcb7f97f12924b83ab86ead6216
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Adopt to toolchain changes and fix the build with the
current snapshot.
This patch adds some missing overrides and build system
configurations.
Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Clean the way that we maintain patches by keeping them ordered by
their number and let the shell order them when giving the list to
git am.
Provide a update-patches.sh that maintains the proper command lines
to use and run a cleaning script on the resulting patch to avoid
the SHA1 to be added to the file as it changes every time the patch
is applied.
Change-Id: Ia93cf4b35f5f847a8723a31fc476443864242737
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We should not include chromium headers outside of core since
they might depend on defines or other build options only set in
the gyp/ninja environment.
This patch removes the need to include net/base/net_errors.h
in the API implementation of the QQuickWebEngineView and also
removes the chromium source directory from the global include
path. This prevents including chromium headers outside of core
by mistake and also makes it possible to load the project in
QtCreator without disabling indexing.
Change-Id: Icd13b6caa52509ef2a1b6b44eaffb34d8ae4addf
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Use the second parameter of $$absolute_path to resolve the
git config value qtwebengine.chromiumsrcdir, in case it's already
absolute.
Change-Id: I68caf5c2f208d3caae69c1f6f361c916ce3f3d93
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt build system assumes that when building a module against a release
build of Qt, syncqt was already run at package creation time. So we have to
run syncqt when creating source packages.
This patch changes the syntax to separate the file name base from the
package version to use.
Change-Id: I4ffb4a7d9d8e8e0a1d681dfb9d337b8ab9f76d9a
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
* Add a .tag file to the archive that contains the sha1 the package was created from. This is useful for diagnostics.
* Use bash and enforce error handling (it's easy to accidentally include bashisms)
Change-Id: I217942da2e985772567da91a7635e5e81533ca95
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Replace doesn't matches anything with QMAKE_DIR_SEP, that is
backslash on Windows, because absolute_path and _PRO_FILE_PWD_
returns forward slashes.
Change-Id: Ieba1684782d565885f4069f408cfb129476e301d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
Backslash from mocCmdBase is processed as an escape sequence in
generated gyp file. E.g. Qt5\bin\moc.exe turns to
Qt5[BS]in\moc.exe.
Change-Id: I09a04b0e168e1139720c44307f192f7a9368ad43
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
| |
This is necessary for the compiler to find include
files following the "#include <FRAMEWORK/file>" syntax.
Change-Id: Ia40b6bbe571e2b275a502c2de60cceeecc9b0f6b
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
| |
MSVC linker needs file extension, otherwise it searches for .obj
files, but Qt has Qt5*.lib files.
Change-Id: I4fd5e1d6001ea309da456c43ffc79cb5944a1ef3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I14dbc2d4770cb0efe9a227e4f113e83c50e00283
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
| |
Change-Id: Id794add1267ebea804b050bb50e232bcf5f7dd13
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
The || true syntax does not work on Windows.
Also, normalize the paths to the underlying OS style.
Change-Id: Ie13d2646fe239fccb9ab7b558a6c8d56b779b206
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
Removing some duplicate lines
Change-Id: I92059eb42cedf5f912a595bbab4a73a1011d6dae
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On some embedded setups and Windows unittest targets bring in
new locale repack actions which use the -g and -b switches of
repack_locals.py with @pymod_do_main. Since we did not implement
these options the script execution failed. Add placeholders for
these options.
Change-Id: Ie11928b025448bc059fb1e3f2e695fb7698a7937
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch introduces a new mechanism to retrieve submodules.
The utilities in version_resolver.py provide means to download
the upstream DEPS file for a specified Chromium version.
This makes it possible to check out the needed svn branches
and specific revisions used for the release. We still use the
git repositories found in the upstream .DEPS.git file but since
it is not regularly updated after the branch-off, we try to match
the release svn revisions to git shasums which is possible since
each commit includes git-svn-id's.
Also add a maintenance tool get_version.py which reads the Chrome
release information from http://omahaproxy.appspot.com.
We now pin the latest stable channel Chromium release from branch
1650 with the version number 31.0.1650.63 and a branch-off date of
Sept 23rd.
Change-Id: I333ada4250999b442cd244821818bace9e6136f4
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
Add additional conditions to the blacklist function
so that we include files needed for Boot2Qt-Android
but exclude other files not needed for the build.
Change-Id: I7cda448a943dc776ad6d29c872048cf256da599e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
Let's make sure that the submodule integration succeeds first.
This reverts commit 584a8c3c637997fbb6772ab75aea1bd587b82a37.
Change-Id: I972e5540031636489f0995ea864c4dcfc8e5cd7a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
| |
Later we can add 'win' here as well.
Change-Id: I80ff9a2855b2a27e29146b2e6b30f55020f5de52
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch introduces a new mechanism to retrieve submodules.
The utilities in version_resolver.py provide means to download
the upstream DEPS file for a specified Chromium version.
This makes it possible to check out the needed svn branches
and specific revisions used for the release. We still use the
git repositories found in the upstream .DEPS.git file but since
it is not regularly updated after the branch-off, we try to match
the release svn revisions to git shasums which is possible since
each commit includes git-svn-id's.
Also add a maintenance tool get_version.py which reads the Chrome
release information from http://omahaproxy.appspot.com.
We now pin the latest stable channel Chromium release from branch
1650 with the version number 31.0.1650.63 and a branch-off date of
Sept 23rd.
Change-Id: Ibbf565f876af79dc008bcd161fddcbdd8bc73977
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Working directory can be wrong when calling getChromiumSrcDir.
On Windows cwd is inside Chrome source directory when it called
from repack_locales.py that causes git config to return empty
value. This causes the function to fall back to snapshot directory
even if upstream is used.
Changing cwd to qtwebengine_root, running git config and restoring
original cwd resolves the problem.
Change-Id: I1bef84ce791f63d3c9e7d6c9506e99c0c53cfc3e
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
This makes it possible to use drop-in files for platform specific
options needed for example for Boot2Qt.
Change-Id: If9db228ac4be414bfea6f4eafe5199ffee495a48
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
| |
sys.path.insert(0,... can be harmful, let's not take that chance
Change-Id: I00e5c70ba97cddbc596a6a0efb1019a08d3f4ff7
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
Via QLibraryInfo. Also pick the name from qmake, and drop the
hardcoded value.
Add better error reporting when this fails.
Change-Id: I44891a16f079b6c3c334f7f2bafa9edc0b4d69e4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
Building on top of the repacking of .pak files, we now ship
the whole array of repacked locales and pick the appropriate one at runtime.
Change-Id: I0096e3eac6a1fc83885fd11e0fa55a746f8e45d8
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We used to wrap various .pak files in qrc files, but it turns out to be
very memory inefficient compared to chromium's approach of mmaping
those files.
Drop the pak->qrc logic and instead add some pure gyp targets to repack
the resources.
We then install those with qmake and look them up with QLibraryInfo.
Change-Id: I6dd3cedf6afa626ed181463911fef8885c9e9add
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I6b4d1ec92b3adc2145a1f2aeec7038eac079d4e8
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
| |
Seems more robust than a regexp, and the right thing to use in this case.
Change-Id: I1ca320606c50fb3d5f593025e23b3e08ae77a124
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
Git submodule works only with cygwin on Windows. MSys Git has
problems with long paths. So matchesOS needs to identify
cygwin environment as Windows to get the right submodules.
Change-Id: Ie7acfaa4d1ef3d891710a39651049c4e5a9f3570
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
NOTE: To build after this you should rerun init-repository.py or run
$> git submodule sync
$> git submodule update
$> git config qtwebengine.chromiumsrcdir src/3rdparty
This makes everything build by adjusting paths.
Other mixed-in changes:
- Rename qtwebengine_src variables in scripts to qtwebengine_root to
avoid confusion.
- Cleanup the release and debug extra targets that were in lib.pro.
This file has also been split into src.pro and core.pro.
Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only move files without adjusting any paths.
This moves:
- lib/quick -> src/webengine/api (API files)
lib/quick -> src/webengine (other files)
This contains the main QtWebEngine module library since
<ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>.
- lib/widgets -> src/webenginewidgets
Also rename this directory to match its module name and rename Api to api.
- lib -> src/core
- process -> src/process
- resources -> src/core/resources
- tools/* -> tools/scripts/
The build directory is spread as follow:
- build/build.pro -> src/core/gyp_run.pro
- build/qmake_extras/* -> src/core/ (for the host and target .pro files)
- build/qmake -> tools/qmake
- Build related scripts -> tools/buildscripts
Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I08edcd97e9e2c38d9984b8ed2fbc9b64c88f8dd5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The updating procedure for chromium is now as follows:
- update 3rdparty_upstream to the requested state for the snapshot
- initialize 3rdparty submodule by executing
git submodule init -- 3rdparty
git submodule update -- 3rdparty
- execute the export_from_git.py script from the QtWebEngine
top level directory.
- do a "git commit -a" in 3rdparty/ and write an appropriate
commit message mentioning the exact state from where the snapshot
was taken from.
- do a "git show" to double check the changes for the snapshot look
reasonable.
- push the changes to the 3rdparty repository.
Change-Id: I7806d284c9a146f857600cfef0face8331af646a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
While we're at it, also remove a stray currentDir variable
in readSubmodules.
Change-Id: Ia814906597f436513c4e57ed487ba478154eee4f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|