| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Local file and data url support can simply be added
by registering the appropriate ProtocolHandlers.
Displaying the contents of a directory is slightly
more complex. This requires access to some html
resource files that can be used to list the contents
in rows. For Chromium such resource files are usually
contained in a .pak file which is shipped with the binary.
Since deploying additional files is very complicated for Qt,
we want to use the Qt Resource System to bundle .pak files.
Therefore this patch adds handling of rcc content generated
from a .qrc file to our gyp_generator.prf.
Further it replaces the regular ResourceBundle implementation
with a Qt specific one.
And it also implements a DataPackQt class that allows
using DataPack instances with data from a QByteArray and
therefore from the Qt Resource System.
Change-Id: Ic41e34fbd9aec8596cbc85666a762ecdaa604edc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
QMAKE_FRAMEWORKPATH contains the location of all the
Qt frameworks on Mac. We need to add this variable to
our gyp libraries sections in order to make sure that
the linker can find the frameworks.
Change-Id: I009ca834ca51dc969f2fadb12a3a98ac28f31a26
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
With a unix only implementation for now.
We're gonna need this to resolve toolchains' paths since gyp
won't take anything but a relative or an absolute path.
Change-Id: I4646deee0a17ce0f929d987d98826eaad524cf25
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
| |
One reason for doing it is that we might have to generate a some common gypi
material in order to pass along things like compiler and the like.
Change-Id: Ib04ccde38a576d637f84401b9a09c6e01d7583e5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
Add proper support for GYPINCLUDES in gyp_generation.
Rename the exclusion gypi to a more generic name so we
can use it for more intrusive changes (we'll need it for mac).
Change-Id: Ie26f579c33d5e35b8c904fab9f448cde11bf0072
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I1b5259d7e35631c9cce93b61426846cfb0b92882
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We still need these excludes because of two static functions:
RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget
void RenderWidgetHostViewPort::GetDefaultScreenInfo
We implement these in our shared_globals.cpp and not excluding
the platform implementations of render_widget_host_view causes
multiple definition errors during linking.
This reverts commit 02add3497f1a83672453a88bd72d623c67df8eda.
Change-Id: Iec7a489f47a7ba95df5ea88b4ae1788ce5404931
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
| |
Frameworks are only needed on Mac.
Change-Id: Ic76a04e42ce1e6032b52c10276feef8abd616c1f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
| |
Change-Id: I20dd425412f1354f9cf45e7c6c2977f73142efb6
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
| |
We do not need to exclude these files from the build any longer,
since we already have our own RenderWidgetHostViewQt class for a while.
Change-Id: I755c528de3d37400dfd52d02fbd45d99996ba7ba
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
| |
Change-Id: Ic261e5aa38b04632c019d577117e9fb205462d82
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
Adding several patches to the repository that need
to be applied to the chromium sources in order to allow
building on Mac.
Change-Id: Ie06250a828b3533e2f48563ce374e63fc25d16cf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix a typo so we get the correct CHROMIUM_SRC_DIR and add it to
INCLUDEPATH so that QtCreator indexes Chromium headers.
Also add NINJAFLAGS environment variable to ninja command line
to be able to specify options to ninja, like how many jobs it
should run when using icecc.
Change-Id: Ib494dc5c71d4e3a4eac419118c9cf6b1c474b6da
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This avoids the Makefile target colliding with the submodule name.
If both have the same name, the target would not be invoked.
This is because make would find a file/folder ninja in the build
subdirectory, and therefore belives that the dependencies for
the target "ninja" are fulfilled.
Change-Id: I7ef1974e06d9cd7a6023d0d17170e0bf730c4b87
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chromium is not using a regular git submodule based
repository layout. Therefore some special tweaking is
necessary.
This script will take care of setting the correct
submodule paths and references after cloning the
qtwebengine repository.
Further it also downloads and builds the ninja build tool.
Change-Id: I999ef33cbdbe3bfaff88253bb543ba77f5b68fd7
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
| |
Change-Id: Id12c5810e83c47a1c7289515cabc5ddd9a8a280b
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Ideally we should find a way to use the binaries available
in src/third_parth/gold.
|
| |
|
|
|
|
|
|
|
|
|
| |
Fix the gyp generator to allow including the moc file directly
in qwebcontentsview.cpp to be able to use Q_PRIVATE_SLOT
instead of having the private object deriving from QObject.
This also removes the use of MOCABLE_SOURCES whose entries were
added to 'sources' without moc being run on them first.
|
|
|
|
|
|
|
|
| |
Having ninja in the PATH should be good enough.
If that didn't work, we try to find it in the most logical location
relative to CHROMIUM_SRC_DIR and bail out otherwise.
Since it seems unlikely to vary, and can be convenient to keep persistent,
we put it in .qmake.cache if qmake uses a cache.
|
| |
|
|
|
|
|
|
|
| |
Introduce a few more bits of our own very basic implementations
(URLRequestContextGetter and NetworkDelegate subclasses).
Still need to figure out the appropriate dependancies in blinq.gypi
|
|
|
|
|
|
|
| |
process uses the same code as lib and decides at runtime which
code to run. Fix the debug build by making sure that all infrastructure
code is available in both process and lib by building common code
not shared directly through chromium sources in a separate static lib.
|
| |
|
|
|
|
|
|
| |
Use a gypi files for that with target defaults with our file
exclusion patterns.
Another patch bites the dust !
|
|
|
|
| |
We shouldn't try to run moc on such files...
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Change the semantics of getOutDir, introduce getConfigDir.
Rely on Gyp's configurations mechanism to get a sensible
path for the BLINQ_PROCESS_PATH in both cases.
Also make the build smarter in that re-generation of gyp files
will lead to re-gyping.
|
|
|
|
|
| |
technically it's more correct now that we don't even bother and
generate the .gyp file directly.
|
|
|
|
| |
And subsequently clean up the manually checked-in moc file.
|
|
|
|
|
|
| |
This reverts commit 0e7244d61e01ab4f2e3532d274115903eae7a3d7
with a few improvements.
We now need to patch the shipped version of gyp in tools/gyp.
|
|
|
|
|
|
| |
Changing the toplevel-dir does not work with libvpx's
evil gyp files. The unpack_lib_posix.sh script fails.
Therefore we cant use it for now.
|
| |
|
|
|
|
|
|
| |
We simply needed to specify the --toplevel-dir command line argument
when invoking gyp in order to get a sane out directory structure again.
Also update the README to reflect a bit better the current state of things.
|
|
|
|
|
|
|
| |
This way we won't have to define the BLINQ_PROCESS_PATH environment variable
except in the case where we want to override that value.
Refactored some of the output dir logic in the process
|
|
|
|
|
|
| |
This reverts commit 6d4e28f380d81eebeabac139c7f8e25de53ddee8.
GYP_DEFINES does the same job :)
|
|
|
|
| |
Until a developer-build option is in place, you can do export GYP_FLAGS="-Dcomponent=shared_library"
|
| |
|
| |
|
|
This should allow us to have much better integration by generating the necessary gyp
files directly from qmake.
Mostly works for now, though we will most likely need to build the gyp generation
as we go.
* Out dir logic is still crap and needs to be (re)worked.
* In the same vein, we probably don't want the generated gyp
content ending up in the source tree in the long run, which could prove tricky
with relative paths to sources and all.
|