| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Visual Studio enables the C++11 features it supports by default without
using the QT_CONFIG logic.
Change-Id: Ifcd9ae230a081783256c99183c10fc8295c014cc
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Python 3 is not supported by the Chromium build system and
installation of the Qt WebEngine libraries will fail.
Change-Id: Ie402c069afecf087de8521401ed4261e74df8b87
Task-number: QTBUG-43242
Reviewed-by: Andras Becsi <andras.becsi@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>
|
|
|
|
|
|
|
| |
GCC 4.6 does not support all the C++11 features that we need.
Change-Id: I41974b16c361ea1bb1934758bf2eb3b73d2df653
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
Skip the build otherwise. This is so we can land the new snapshot,
which by now generalized the use of some c++11 features (See
https://chromium-cpp.appspot.com/ for details).
Change-Id: If17b88030f8fd28f48e1f52f03c28b015975ad82
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty
Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For dependencies that have caused trouble before, such
as libdrm.
Task-number: QTBUG-41516
Change-Id: I0cee98282e93460971471796a65a43be4750c6b0
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move the logic to mkspecs to keep the .pro files robust.
Add the basic infrastructure for config.tests, the first one
of which will consistently ensure we have libcap on linux.
Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11
Reviewed-by: Andras Becsi <andras.becsi@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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
qmake may have quoted already because of certain characters like ~ in
build path
Change-Id: I8a085d23da3da8876f3acd807c9468fc43c7dacb
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ia0cec7f1498c3459ec1d1ce6ab807994c04564e2
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some of these files enforce crlf conversion.
For packaging reasons we have to make sure
we never have crlf in our repository.
Change-Id: I3b4da212c587f8461819f3d01e4967ebefaef4b0
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Specifically we want to keep the file
src/3rdparty/.gitattributes.
Change-Id: I76f3fe6d6f8b8477834e31a4806f23928a0ca010
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
40.0.2214.5.
Include files related to:
- components_strings
- chrome_version.rc.version
- error_page
- *.grdp files within components
Exclude files related to:
- junit
- polymer
- google_input_tools
- cython
Change-Id: I2388ec7694890d573cbea843de23471c6a5395a6
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: I9d11038779494a3bb14107369b54c06baead96a9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
This should help users understand which prerequisites are
missing from their system and may also help find invalid CI
configuration quicker.
Change-Id: If564825c11782b6e760f016893010008d9a551fa
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
The Windows command shell try to interpret the single quotation mark
as a command.
Change-Id: I4dc4382bdbe0c90565f6ac56c33a80971669344c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
| |
This fixes 7639513f94fe45b5202349d2891e46b2295606a0.
Change-Id: I512ca97d8b4fc8b7c48f03ab32d476bb3a791157
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
| |
The GCC version check is only run on Linux.
Change-Id: I524508d763005190764526ce337dc348e5ba4fcb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
The build did not work when configuring to linux-g++-64,
although the platform is supported.
Task-number: QTBUG-41918
Change-Id: If2c8a5722d7d6b0ca28a99763531d8ffd9534de7
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
| |
The snapshot ninja may cause issues in some environments, where a different
ninja version may work. If the user has NINJA_PATH set in their environment,
prefer that over bootstrapping our own.
Change-Id: I4c6d2f479aeae1f5137705ed2deb995b59ea287a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I91ce455ac5e3992e50d13c14f4035f91baad85bf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
This fixes cross-compile settings detection for cross-compilation
environments where the C compiler cross-compilation flags are set in
CC/QMAKE_CC instead of CFLAGS/QMAKE_CFLAGS (e.g. OpenEmbedded).
Change-Id: I0a7b0f6c47a00775ec18073a16359c8351363285
Reviewed-by: Andras Becsi <andras.becsi@digia.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>
|
|
|
|
|
|
|
|
|
| |
We need a better solution to find out if we are building on a 64bit system.
This reverts commit 58806890b496aef7c2880e651a8bb73b090cd72a.
Change-Id: I43c48b5cbc5e96f93b65165b0445670a832b0206
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Embedded platforms are not always called exactly
linux-g++ only. A platform may also be called
linux-arm-gnueabi-g++ or similar.
Fail gracefully if the host architecture is not x86_64.
We require 64bit for linking QtWebEngineCore.
Change-Id: I62c32606517bed6ed4307720d3c95e8019ec134b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
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>
|
|
|
|
|
|
|
|
| |
Enabling rendering into a WGL backbuffer, in addition to the EGL/angle
one.
Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I1edd16e6875198d7480897e7b2e2fbf68b245883
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.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>
|
|
|
|
|
| |
Change-Id: If696de316dd7b3b801ba46d1a54c37eafa901bf1
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ie9334cc9cdd240b2f5ceea0e31d82258045ea18c
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes Qt's packaging scripts that use the --to-crlf switch of
zip, which doesn't work when files already contain CRLF.
The script now takes much longer to run and a progress indicator was
added to the console.
Change-Id: I459c0d95f67b40ab57ff3b337210847cc60debc7
Reviewed-by: Andras Becsi <andras.becsi@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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This moves init-repository.py to tools/scripts since it should now
mainly be used by Qt WebEngine developers after our integration with
qt5.git.
Also remove the README file since most of the information is no as
relevant for the Qt module audience as it was for a labs project.
Change-Id: Iad9f6582d0ec0834cdaf38d0551d24f2c273badf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The real problem that this patch fixes is that moc and rcc generated
files are added to the gyp sources variable with an absolute path,
which for some reason triggers gyp to place the output file in the
same directory as the source instead of the Release or Debug
directories. This causes the last compiled file to be shared by both
the release and debug builds when building debug-and-release, and
MSVC will fail linking if the linked files have incompatible CRTs.
This patch fixes the issue by moving both the generated cpp files
and their compiled objects under <(SHARED_INTERMEDIATE_DIR), which
points to (Release|Debug)/gen.
Change-Id: I4143340acf56c3c7ed665aaae8f6221c310aafa9
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
|
| |
Upstream Chromium hasn't been building with the version of clang
available in Xcode 5.0 for a while and we have to disable the build
until we see a benefit to maintain this build environment.
Change-Id: Ia91844dc7f3be1b1623610be417409d0d065c623
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
| |
Change-Id: If391781604861961387019ea15e9c29b6a1e3e1a
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
Chromium has enabled this in the 37 based branch and it worked
with Qt WebEngine as well.
Change-Id: Idb1f9a2133be645cd044c9f0163cc87f6ae8e474
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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>
|
|
|
|
|
|
| |
Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@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>
|
|
|
|
|
|
|
|
| |
Ninja needs to have an _x64 appended to the configuration in order
to build the 64 bit targets on Windows, as opposed to Linux and OS X.
Change-Id: Idc9888c9f80ccb27d26fb86588ed39fba92a2c71
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
Those configurations should be re-enabled once we support them
properly.
Change-Id: Id8019df8e0b34a2fb1a411780689f28def50546f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chromium itself requires XCode 5 to build and would require
a few modifications to build with the version of libc++ that
ships with XCode 4.
Disable the build on that environment to at least get passed
the Qt5 CI.
Change-Id: I296055ac1880a9e09e2c0e8343058ff5add837c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 currently don't support this configuration.
Change-Id: Ibd6ad9e1ffc993a2224fb814109467bd7b65f0fc
Reviewed-by: Zeno Albisser <zeno.albisser@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>
|