| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> tools & tests are licensed under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header
(in those files which will be under GPL 3 with exceptions)
Change-Id: I59fcbb8cd1ca42b1a5ef96577bcb35ea0af01b71
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Support for the B2Qt/eAndroid platform is discontinued with
Qt 5.5 so we can remove all remnants of the android platform.
Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove unneeded codepaths now that we can trust the git shasums
found in the .DEPS.git file.
No need for parsing and verifying remote branches, we can simply
fetch the specified sha1 from origin.
This patch also unifies the 'shasum' and 'ref' members of the
Submodule python class since the 'ref' member can represent
both chromium's version tag and the sha1s of the submodules,
there is no need for a separate codepath for these.
Change-Id: I1300b5b74f4d2e6984943570963b2f813b1b1679
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chromium is now relying on git for its releases and isn't creating
release DEPS files anymore.
This patch makes sure that we ignore any deps not starting with src/
to exclude the script repositories outside of the Chromium sources
and it removes all the svn-related logic.
Change-Id: I24b1839f919821382b8c5993c71251dbd6108d4f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- The svn repo string would be something like:
...branches/2062/path_suffix
and I want only the branch number in this case.
Updated git_submodule.py to support that case and use regexp
instead to keep thing a bit simpler.
- .isolate are gyp files, moved the exception at the top
- Changed some inclusions/exclusions
- tools/ is now all excluded by default with exception instead
of all included. We don't need most of it.
Change-Id: I6d0666d9af7fc6a0f3c4fe866adf2744f13f7c35
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This prevents python from escaping the special characters that
resulted in git not finding the proper shasum for the git-svn-id
regular expression line.
Change-Id: Ic5449db6319b638cf692d2b4427ce5de7cbac66e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu>
|
|
|
|
|
|
|
|
|
|
| |
Since some projects are maintained in git repositories only even the
'svn' DEPS file has some git shasums instead of svn revisions.
Check the current shasum and tag outside of the ref block so we actually
end up checking out the parsed shasum for non-git-svn repositories.
Change-Id: Iabc4a5b15e50a0f0df84179a65929352ee2addb7
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Instead of grepping for the VERSION file update in the git log
check out the sha1 that has been tagged with the requested version.
Also harden the regexp we use to translate svn revisions to git
sha1's and further clean up the findShaAndCheckout function.
Change-Id: Iaeb7ebee558b7ebadaf3428e06626736601198cf
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
| |
This patch makes it possible to reset the upstream chromium repository
to its baseline state.
Change-Id: Idff94a0f873e994716f77c83f4c5b79bcd48aec5
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
The Windows git version is not able to check out some extra_os
dependencies but since they are not relevant on Windows
we can just skip them.
Change-Id: I552e0c3a3bf2f26a8e44901ee700d6e19c138b45
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
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>
|