| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
This makes sure developers at least build this codepath so we
have the needed coverage to find out if something breaks.
Change-Id: Id56ecf5bb051e873e9bcf313a50a5eec23c2bd83
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
|
|
|
|
|
|
|
|
|
|
|
| |
The testsupport API is used for test those features that are not
planned to be accessible via the public API. For example,
signals of the chromium's error page should not be visible for the
develepor but it is important to test whether the error page is loaded
properly.
Change-Id: Ie5b3265a207d05649cabd624a001a6ffe2e45971
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
These are needed on Linux, since the core layer can
not rely on the shipped third_party/khronos headers
because that would break the build on GLES configs.
Change-Id: I598f58a9830b31a56425db60b7fc36c3f34f8581
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|\
| |
| |
| | |
Change-Id: Idb0ac6490d6faf843acccc11ce68604a878d9ecd
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To check the XCode version, default_pre has to be run first.
Under most circumstances the order is not important since the value
gets cached, that's why current builds usually work.
Change-Id: I2613e92189592d7b25200e22a378f9f593b5057e
Reviewed-by: Andras Becsi <andras.becsi@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>
|
|
|
|
|
|
|
|
| |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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: 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 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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
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>
|
|
|
|
|
|
|
| |
We currently don't support this configuration.
Change-Id: Ibd6ad9e1ffc993a2224fb814109467bd7b65f0fc
Reviewed-by: Zeno Albisser <zeno.albisser@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>
|
|
|
|
|
|
|
|
|
|
|
| |
To allow the qt5.git integration, allow the build to succeed if the
repository is checked out on a platform that we don't maintain.
This is the initial list of platforms that we want the integration
to succeed and we can add new ones once we start maintaining them.
Change-Id: Idce2a84eb8d5b1ef7f14d399fe013f666b479108
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
With Qt 5.3 mac_sdk_path ends up being empty, so make sure to set
the proper flags for chromium to pick the right sdk.
Also add clang_use_chrome_plugins=0 so we can remove it as well from
the Mac-Use-libc-instead-of-stdlibc patch.
Change-Id: Ia132f079f905761644ad26c728f7116f538ea62d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
We had the logic in place to detect mocable cpp files all along,
but only used it for headers.
Change-Id: I00ea4e3ba081c5c7d37fe35ec78233e4961481e3
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|