| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
|
| |
| |
| |
| |
| | |
Change-Id: I1a4b96a2a695b4be4e936275c59f939b887098d1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
Move the resources for remote debugging out of qtwebengine_resources.pak,
into a separate qtwebengine_devtools_resources.pak. This allows developers
to decide at deployment phase whether to ship the (rather large) resources
for the devtools feature, or not.
Task-number: QTBUG-50646
Change-Id: I74c75ad30989b97a63e6bce3abbc33360d1452e4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
| |
Also moves the ICU data from the prefix root to the resources subdir.
Change-Id: I1eec6c09a8ff1f87166a9f8a2a010b770198751e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Moves the qtwebengine resource files to a resource sub-directory so
they are not installed in the prefix-root.
At the same time the search of them is improved, so application
developers can install them in the application dir, even if the prefix
dir exists.
Change-Id: If64f16ae6ee924c66fb0a0b024bca2caa6400ee3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Since qtbase/e88334e0 we must not put MSVC linker flags into LIBS or
LIBS_PRIVATE. QMAKE_LFLAGS is the right place.
This fixes a build error with MSVC:
LINK : fatal error LNK1181: cannot open input file '\OPT:REF.obj'
Change-Id: I2971e412dd8d5cfe8b7aca218d679dd136019dd8
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The public API symbols are compiled in a static library that's linked to core
with --whole-archive when using gcc. There's no equivalent for this in MSVC.
We hacked around this limitation in commit 38944be4 by creating a source file
that includes every public header.
Unfortunately this breaks debug_and_release builds, because we must inject this
generated source file as absolute path, and gyp will generate the same object
file for every source file that's specified with an absolute path...
This reverts commit 38944be4 and replaces the work-around by simulating
-whole-archive on MSVC. This is done by passing all object files that belong
to qtwebenginecoreapi.lib to the linker via a response file that is created
when building qtwebenginecoreapi.lib.
Task-number: QTBUG-48376
Change-Id: Iaa991fe96a2c336d982d29d6924ce950c0be5398
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Though the destination directory for a debug and a release build differ,
the static library is still intermediately placed in a common directory.
This patch adds a unique suffix to the library name to avoid clashes.
Task-number: QTBUG-48287
Change-Id: I299704529539d0b7ed9aaf1df06245ae1c3ce363
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Move general docs to src/webengine/doc/src
- Remove a dedicated .qdocconf for Qt WebEngine Core,
build its documentation as part of Qt WebEngine
- Describe all Qt WebEngine modules on the Qt WebEngine
index and overview pages
- Add a wireframe drawing on the architecture
Change-Id: Ib4261d1a16bbaf313d0f858515184a96dab524a5
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|\
| |
| |
| | |
Change-Id: I9977663123560a22f493b8c02d02de8897b38666
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move out the resources intended for 100% scale factor from
qtwebengine_resources.pak into a separate _100p.pak, and add also a
_200p.pak.
This fixes crashes and artifacts on Windows with high-DPI setups.
[ChangeLog] qtwebengine_resources_100p.pak and
qtwebengine_resources_200p.pak have been added alongside
qtwebengine_resources.pak. Depending on the target environment
either one or both have to be deployed.
Task-number: QTBUG-47018
Change-Id: I1f305ada3ca4e4ae356276a59e0e92c94cca2d3f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Now that QtWebEngineCore has public API, we should document the module.
Change-Id: I29660243da80b5923836bb2d0394dc2e8be209e2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Chromium now links statically to ffmpeg, and the ffmpegsumo plugin is
no longer built.
This also makes the plugin dir unneeded.
Change-Id: I2204ce966b067886d57a9548d8aec829b73642d8
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch introduces a new public C++ API layer in preparation to make
it possible to integrate with lower level Chromium features related mostly
to networking operations like accessing and blocking cookies, custom
request headers, etc.
This API layer can be used both by Qt Widgets and Qt Quick applications
with a small C++ core. It should contatain API to access features that
usually run on the IO thread to make it possible to perform heavy tasks
that would otherwise require costly context switches to the UI thread.
Furthermore for these features a QML API does either not make sense,
since they are non-UI-related, or a QML API is simply not feasible,
because the API is meant for advanced usecases like web browser
development (i.e. custom protocol handlers, network traffic
interception cookie syncing, etc.).
In the long term this layer could also make it possible to reduce code
duplication in the widgets and quick layers by moving common parts to
the core layer.
The new API is built entirely by qmake as a separate static library which
is then linked into the QtWebEngineCore library built by gyp and ninja,
to prevent the build options passed to Chromium to break the API layer.
As a first step this only contains the global headers for core.
Change-Id: Iccf8544587cde7c0d9c6abd462e4766bf9ec81ae
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Deploy resources, locales, icu and plugins into the build directory
instead of install directory. It is necessary when Qt is configured
with -developer-build and -prefix options: the compilation may fail
if user has no write access for install directory.
Task-number: QTBUG-45796
Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Provide a transport mechanism for WebChannel over chromium IPC and
expose WebChannel in our experimental QML API.
Co-authored by Milian Wolff.
Change-Id: Ia24b1d4ebc8515de677d4849ec33cb55c963918e
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty
Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This moves all installs inside the the release-only-with-debug-fallback
block to prevent the debug ffmpegsumo.dll to overwrite the release
one on Windows (and get use for both debug and release builds).
This will use the release version for both instead by default.
This also moves the load(qt_module) call higher to make sure that
build_all is added to CONFIG at that point.
Change-Id: I2584a28e5eaaf5028798703fb387ac2b120d7ea9
Task-number: QTBUG-43348
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/3rdparty
src/core/content_browser_client_qt.h
src/core/core_module.pro
Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As QtWebEngine now uses 5.x as its version number, we can just
provide cmake tests and let qmake scripts do the rest.
Task-number: QTBUG-42073
Change-Id: I28ccddbd1849980074dfbeefb5cb5a70c9209ab1
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
src/core/content_browser_client_qt.cpp
Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fix deploys the following files into qtbase without make install:
- qtwebengine_resources.pak
- translations/qtwebengine_locales/*.pak
- icudtl.dat
- plugins/qtwebengine/libffmpegsumo.so
Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There is currently no convenient way to deploy QtWebEngine into an application
bundle on OSX. macdeployqt copies frameworks into a .app bundle's Frameworks
directory but this makes no sense unless all the needed files are also
distributed with the bundle.
This patch moves:
- The ffmpegsumo.so library into Libraries/
- Locale .pak files, qtwebengine_resources.pak and icudtl.dat into Resources/
- QtWebEngineProcess into its own .app bundle, itself into Helpers/
QMAKE_BUNDLE_DATA is used to copy files into the bundle while INSTALLS is
used when installing normally. A LOCALE_LIST is explicitly listed since
QMAKE_BUNDLE_DATA can't handle the * glob to match all source files.
Change-Id: I5c0df57b4b9e93f9cce34a74a6e024bf90d37b5c
Task-number: QTBUG-41611
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
core_module.pro is the one responsible for deployment of the binary so
it makes sense to also let it handle the other files to install.
This leaves core.pro to only handle sub-projects dependencies.
Change-Id: Ibe433eceec7fb0a9f806dfa89dccb0bedeaccc59
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use QSGLayer and get rid of RenderPassTexture so that we can render
intermediate layers with the QtQuick 2D Renderer.
This reintroduces the private dependency on QtQuick since the
QSGLayer factory methods aren't available publically, and also that
we need to use QSGImageNode instead of QSGSimpleTextureNode to use
them.
Since we can't subclass QSGLayer to hold a reference to SG objects
directly in the nodes that use them, store them all in the wrapping
DelegatedFrameNode in a SGObjects structs. This works assuming that
the DelegatedFrameNode will always be at the root of our nodes,
layers and textures; if the scene graph destroys the
DelegatedFrameNode all child nodes will be destroyed with it.
Change-Id: Iedeceb8f98eb54fd8228a677c366d6df9a270e11
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|/
|
|
|
|
|
|
| |
If QtPositioning is available, provide chromium with a
LocationProvider that uses it as a backend.
Change-Id: I53ad3b45e49d0d2d181c1a6459b7be764293c2a6
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Configuring Qt with -force-debug-info -no-strip should carry the
needed cflags to ninja through gyp.
Also prevent stripping the library in release with force_debug_info.
qmake will already call strip --strip-unneeded by default when
running make install for release builds so remove that condition
completely from core_module.pro.
Change-Id: Ic31fca5b4365d61161f2500c2de011faa3e19c14
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
Most importantly, get rid of QOpenGLContextPrivate::globalShareContext
which will be removed before the final.
Change-Id: I5796fa822d2962c21fd8b6d8d3c196686d536e3d
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since 3cd70c11bc7bbe3c5e9e4972d2273cf51bbdc30e in
qtbase Qt modules require cmake tests to be present
which makes QtWebEngine fail with "Missing CMake tests."
We do not support building with cmake at this point,
so disable these tests by setting CMAKE_MODULE_TESTS
to '-' for module pro files.
Change-Id: I777e6b2c7ce975ad021281800987f9d3ce173399
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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>
|
|
|
|
|
|
|
|
|
| |
With this patch we get usable debug files.
This also makes qmake strip the core lirary from unneeded sysmbols
which is especially beneficial on embedded.
Change-Id: Ic1cadd87dbedb9817512a8b4f251cc3e43f028d1
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Always check both EGL_EXTENSIONS and the validity of the returned
function pointers. Otherwise bad things happen on EGL implementations
that do not have the extension.
Fix also linking to EGL. CONFIG+=egl has to be in core_module.pro too.
Change-Id: I5e3dc54675d83123fc79e2d27a7af19fcc7f936a
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
To fix the build of the core library override Qt's default
minimum target version of 10.6 because we need to use libc++
for chromium which is only available from 10.7.
Change-Id: I8896c4741d1c9b7bfe6b1c045704aeb2d5affd17
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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 delegates the linking step from ninja to qmake so that we can
let qmake decide the destination of the target itself, easing the
deployment and installation logic across platforms.
The module is only deployed as a binary and no header are available
outside of the source tree. This is only to make sure that the
dependence of the QtWebEngine and QtWebEngineWidgets libraries on it
is resolved at runtime exactly the same way as with other Qt modules,
on all platforms.
Ninja still takes care of the compilation and gyp lets qmake know how
and what to link by dumping the list of flags and input files in a
generated .pri file.
This has to be done in a separate .pro file so that we can make sure
that ninja is run inconditionally before make reaches the dependency
check in core_module.pro, ensured by the parent Makefile.
Note 1: This patch removes RPATH hacks that are no longer necessary
Note 2: Other targets like ffmpegsumo are still linked by ninja. The
same logic could be moved to a qmake file but this require some more
work to make sure that some switches (e.g. -stdlib=libc++) are
coordinated between gyp and qmake.
Change-Id: If65968547bde5b9cf732e31e97931c17ae1921a7
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|