| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Disabling printing saves us compiling those files and files off a
megabyte on the debug binary.
To keep all the configure options in config, the common options
are moved to a shared common.pri.
Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add another gyp flag from gyp_chromium.py, this is needed on some
non-x86 platforms in particular AArch64.
Change-Id: Id9ca1490d0e8637e52cec53c40e9bc40403501f2
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Compiling localized_error needs to depend on the components strings to
avoid a race-condition while building, and repack_locales needed to be
updated to include them into the our locales pak.
Change-Id: I3250b2bbad717f560eeaaf31d59e45167225191e
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|/
|
|
|
|
|
| |
Updating to Chromium 47 and adapting API.
Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|\
| |
| |
| | |
Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Among other things, we store the used compiler in there. This
information belongs into the build directory. Otherwise switching
toolchains becomes challenging.
Task-number: QTBUG-43014
Change-Id: I9bec26a235f5251322792632d4667cc71210286d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
Move duplicated linux configuration to linux.pri
Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch:
- adds required options to the embedded_linux.pri config
- adds missing events_ozone.gyp:events_ozone_evdev dependency
- fixes pkg-config not to pick host paths when cross compiling
- implements missing functions of the OzonePlatform interface
- updates the submodule to include fixes for chromium
Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change 7a1e0d57d1a1683442 determined the Visual Studio version based
on the 'VisualStudioVersion' environment variable. While this variable
is defined by the default Visual Studio command line prompt, it isn't
necessarily set in other environments.
Anyhow, Qt already determined the compiler/Visual Studio version in the
mkspec. We can just reuse this here.
Change-Id: Ibee9526e91ae855151940da6be438705de048c0c
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Chromium now expects the MSVS version to be set in GYP_MSVS_VERSION,
so we need to set that. Fortunately we can use the VisualStudioVersion
environment to do so.
Note we should be setting it to "2013e" when using Express, but I can
not currently detect that.
Change-Id: Id51c04c8d3292c05809d4aa1301a50b12b2d57fd
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
| |
V8 will now by default require two external binary blobs in libexec.
We prefer not having to ship more external dependencies, which are both
inconvinient and a security risk.
Change-Id: Id171f9be83add871bfa7d76c000799ebda9b7666
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Changing the python print signature seems to cause
problems on Windows, so revert it.
Change-Id: I715f792b880a2269ec153bbc73b432c6a4e87cc5
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QtCreator loads qtwebengine.pro some parsing errors
are shown if it picks up the system python3 for basic detection.
Although we do not plan to support python3 with all of our
scripts (since Chromium does not) these simple cases can
be fixed by using the function version of python's print.
This patch also adds the Chromium source path to the core
INCLUDEPATH so that Chromium headers are indexed as well.
Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* scoped_refptr operator for implicit conversion to pointer has
been disabled upstream: https://codereview.chromium.org/510323002
* Group permission API as done upstream:
https://codereview.chromium.org/622793002
* content_worker gyp target has been removed upstream.
* GetPageThumbnailData moved to DevToolsManagerDelegate.
* ui/ui_resources has been renamed to ui/resources
* WebPreferences and ResourceType have moved inside content.
* Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale():
https://codereview.chromium.org/457103003
* Remove obsolete accessibility events.
* AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED
* AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002
* Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002
* Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate.
* Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate
https://codereview.chromium.org/560323005
* DevToolsHttpHandler::Start expects a scoped_ptr now.
* Make sure event_factory_evdev.h is not included when USE_OZONE is not defined
* ErrorPageParams was moved into namespace error_page.
* Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission
* SpecialStoragePolicy moved to namespace storage
* Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate.
* RenderPass::Id was renamed to RenderPass::RenderPassId
* Include view_messages.h for ViewHostMsg_TextInputState_Param
* CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium:
https://codereview.chromium.org/449743002
* MailboxManager::ConsumeTexture only takes the mailbox as an argument
* Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged.
* RenderWidgetHostView::ScrollOffsetChanged has been removed.
* SkBitmap::Config was removed upstream.
* CopyFromCompositingSurfaceCallback has become an own type.
* AcceleratedSurfaceInitialized only takes route_id as an argument.
* ServerBoundCertService has been renamed to ChannelIDService.
Related API has been renamed accordingly.
* TextureImageTransportSurface was removed upstream.
* Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature.
* AudioStream related functions are gone upstream.
https://codereview.chromium.org/569713002
* Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset.
* Include generic touch_device implementation.
* switches::kDisableDesktopNotifications was removed upstream.
https://codereview.chromium.org/607843002
* PageTransition moved to ui.
* Messages headers are not guarded. Including them multiple times does hurt.
* ScaleGestureDetector does not create a standalone GestureDetector anymore.
https://codereview.chromium.org/501503003
* MotionEvent::Cancel and Clone are not virtual anymore.
https://codereview.chromium.org/502993004
* Exclude os_exchange_data_provider_mac from build.
* Remove argument from ScopedClipboardWriter ctor.
https://codereview.chromium.org/558913003
* Remove ShowPopupMenu override from WebContentsQt.
The function is not pure virtual anymore,
and we never implemented any specifics.
* Do not use clang on desktop linux.
* Request functions in ContentBrowserClient
were merged into RequestPermission.
* ninja: use configure.py --bootstrap instead of bootstrap.py
Change-Id: I3575612826db7845461a949b4e737264bb4e8d88
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
This will avoid printing the compiler version python was built with.
Showing the compiler version led to confusion multiple times.
Change-Id: I4ced2128b92c83a41f616bcf756f2c313a9caed3
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
We did not load any localization data on OS X until now,
so the error page did not have any strings, and some
tests asserted because of missing localization.
Change-Id: Icb6de1f7e3aaa6815483d379efaf00e8ed6a1dbf
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Until now we relied on the PATH to pick the right clang version on
OS X which turned out to be a source of issues on build nodes that
have a lot of old cruft lying around which was picked up by gyp.
Set make_clang_dir so that gyp uses the configured clang version
from Qt and remove the env manipulation from our gyp script.
Change-Id: I4ac679ea56fa874eecaa578aad77b462445c0caa
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
|
| |
This is necessary for finding gperf, bison, yacc, etc. on Windows.
Works only if the gnuwin32 directory is on the same level as the
qtwebengine root directory, which is the case with a qt checkout.
Change-Id: I09fe1523d4e4baca6612f1039bbba2e2ff9d87c0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chromium requires relative paths for output-dir and
for generator-output. Also output-dir is expected to
be a subdirectory of generator-output.
This now allows building on windows without running
qmake in recursive mode.
Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
This changed with chrome 37. We only need to define it unconditionally
in gyp_qtwebengine as tcmalloc is never an option for us.
Change-Id: I8b21eb1114582c1d9a8aa61c5f15fc8469721395
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We don't want to fetch the compiler path from the mkspec on Windows
the same way that we do on linux/embedded. Qt usually let the build
environment decide the MSVC toolchain, as it is usually done on
Windows.
This patch also passes the ninja_use_custom_environment_files ninja
generator option to make sure that gyp doesn't try to construct the
build environment by running the env scripts itself.
Change-Id: I6e04471eb994b81a9f1b8b5f149b4dbddbb320a8
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A gyp variable containing backslashes would be evaluated twice when
passed through grit_action.gypi in src/core/chrome_qt.gyp.
For some reason, gyp would end up reducing the escaping of
backslashes once for each variable evaluation, which would completely
remove backslashes from the value.
Fix the issue by making sure that we pass paths to gyp with slashes
instead of backslashes. Python will know what to do with them
regardless.
Change-Id: Id38866fd63a2ba1524a8c998fe577f7f50fca059
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the
config couldn't be found in git.
Move the fallback logic to a getChromiumSrcDir qmake function, and
use it in both places.
The build system will now also print that the Chromium sources will
follow the git config if found instead of the other way around,
since this should now be the normal case as part of Qt5.
Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Most of the patch is about upstream classes/methods that changed.
Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
instead of from the command line switches
Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use the chromium localized error strings for that purpose, otherwise the
error description is always empty.
While we're at it, let's tap into the chromium error pages, which should
hopefully make sense for most errors, and add some static asserts to
check that the qt quick enum and the core one are in sync.
Change-Id: Icf8fa7c3bf4a674c60a10950422135fb6930447a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|