summaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Adjust all the needed paths when using upstream repositoriesAndras Becsi2013-08-203-4/+13
| | | | | | | | Having a separate 3rdparty_upstream might not be the best solution after all, but oh well. Change-Id: Ib834c4d9d56669a3f4308eb614cec787116d6d4c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Replace chromium and ninja submodule by a single 3rdparty submodule.Zeno Albisser2013-08-175-4/+10
| | | | | | | | | | The new 3rdparty submodule contains snapshots of both ninja and chromium. This drastically reduces the size of the repository and can be used by our CI system. Change-Id: Ie7482181f2ba9dba5fc181b1f221a5fae714c8c8 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix compile dependencies of examples.Jocelyn Turcotte2013-08-161-0/+3
| | | | | | | | | | | Touching an external header wouldn't trigger the recompilation of example source files since the Makefile didn't list them as dependencies. The problem was that qmake didn't have its dependency directories set properly since our default_pre.prf would totally override the default one. Change-Id: I1cbb6b259c15a70b872241cf257a6b5f93244cb4 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix mac buildPierre Rossi2013-08-081-1/+1
| | | | | | | We also want to build with no-rtti there. Change-Id: If680760904866e5c95d1ed85fffecfea67dde7d0 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Transform QTouchEvent into ui::TouchEvent first.Jocelyn Turcotte2013-08-011-0/+2
| | | | | | | | | | | | | | | WebTouchEvents have a slightly different behavior than QTouchEvent in that the type of the event is TouchStart for each new point press, while Qt sends a TouchBegin only for the first point press. Since we already need to use ui::TouchEvent to be able to use ui::GestureRecognizer, always do this conversion first to also let UpdateWebTouchEventAfterDispatch chose the proper event type. Some of the code from render_widget_host_view_aura.cc was copied into render_widget_host_view_qt.cpp to fill the needed functionality. Change-Id: Iab1ca0c449b5256a39b5479ce89b662d4e133935 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Split out the Widgets and QtQuick integrationPierre Rossi2013-07-311-0/+9
| | | | | | | | | | | | | | | This is the first step to making proper Qt Modules out of QtWebEngine. The Widgets integration becomes a proper C++ Qt Module while we make the QtQuick side a QML plugin for now (could probably be promoted if the need arises). Code-wise, this means the introduction of a WebContentsAdapterClient interface that is subclassed by the private implementation of our API classes for delegation of things that are UI specific. Functionality from WebContents and the like is exposed via the WebContentsAdapter. Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Do not exclude files by wildcards.Zeno Albisser2013-07-241-2/+2
| | | | | | | | This accidentially also did exclude render_widget_host_view_mac_dictionary_helper.mm. Prospectively also removing the wildcard for windows. Change-Id: Ic5a01099dc5cd85a62b2e9b1ea9f989ad4cf2b1d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fixing Qt Resource System Integration.Zeno Albisser2013-07-192-10/+47
| | | | | | | | | | | | | | Add logic to functions.prf and gyp_generator.prf to invoke rcc from ninja as well. Since we are building the whole library with ninja, this is the only feasible way to get the dependencies right. Changine the TEMPLATE of resources.pro from subdirs to aux, since it is not building a library and not processing subdirectories either. Change-Id: I23dff04e488d839bb54e343588da98e5e9059b23 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the duplicate symbols build failure.Jocelyn Turcotte2013-07-191-3/+3
| | | | | | | | | resource_bundle_*.cc weren't excluded properly and ResourceBundle::GetLocaleFilePath is in resource_bundle.cc rather than resource_bundle_gtk.cc. Change-Id: I9e56a7d88e859354a4d7115a61b99f7487fc7a39 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* [GYP] use cflags/cxxflags from qmakePierre Rossi2013-07-191-1/+10
| | | | | Change-Id: Ia3af98df7ea13d71b40e34e524c49f326003926d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add a python script to generate the chromium .pak resource files.Zeno Albisser2013-07-181-0/+102
| | | | | | | | This is necessary, because the pak files must be available when qmake checks for the dependencies for RESOURCES in lib.pro. Change-Id: Ia173c70746402b2fee09bfa035a9f8780e88cc94 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add support for file and data url scheme.Zeno Albisser2013-07-162-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Add QMAKE_FRAMEWORKPATH to gyp_generator.prf.Zeno Albisser2013-07-091-0/+1
| | | | | | | | | | 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>
* Introduce $$which qmake functionPierre Rossi2013-07-041-1/+17
| | | | | | | | | 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>
* Rename GYPI_CONTENTS to GYP_CONTENTS. Technically more acurate but useless ?Pierre Rossi2013-07-041-50/+50
| | | | | | | | 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>
* Cleanup include mechanismPierre Rossi2013-07-043-7/+9
| | | | | | | | | 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>
* Implement CreateWebContentsView and exclude web_contents_view_* from build.Zeno Albisser2013-07-021-0/+3
| | | | | Change-Id: I1b5259d7e35631c9cce93b61426846cfb0b92882 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Revert "Do not exclude render_widget_host_view_* classes."Andras Becsi2013-07-011-0/+3
| | | | | | | | | | | | | | | | 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>
* Fix the Linux buildAndras Becsi2013-07-011-18/+18
| | | | | | | Frameworks are only needed on Mac. Change-Id: Ic76a04e42ce1e6032b52c10276feef8abd616c1f Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* [Mac] qmake needs to forward frameworks and paths to gyp.Zeno Albisser2013-07-011-1/+22
| | | | | Change-Id: I20dd425412f1354f9cf45e7c6c2977f73142efb6 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Do not exclude render_widget_host_view_* classes.Zeno Albisser2013-07-011-3/+0
| | | | | | | | 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>
* Disable tcmalloc on mac.Zeno Albisser2013-07-011-1/+2
| | | | | Change-Id: Ic261e5aa38b04632c019d577117e9fb205462d82 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add Mac support.Zeno Albisser2013-06-271-0/+10
| | | | | | | | | 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>
* Tweak the build systemAndras Becsi2013-06-273-3/+4
| | | | | | | | | | | 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>
* Rename ninja Makefile target to invoke_ninja.Zeno Albisser2013-06-271-1/+1
| | | | | | | | | | | 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>
* Add init-repository.py script.Zeno Albisser2013-06-273-4/+9
| | | | | | | | | | | | | | 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>
* Add ninja as a submodule.Zeno Albisser2013-06-271-0/+0
| | | | | | Change-Id: Id12c5810e83c47a1c7289515cabc5ddd9a8a280b Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build when binutils-gold isn't installed.Jocelyn Turcotte2013-06-211-0/+4
| | | | | Ideally we should find a way to use the binaries available in src/third_parth/gold.
* Fix build with ToTSimon Hausmann2013-06-201-0/+6
|
* Use Q_PRIVATE_SLOT for QWebContentsViewPrivate.Jocelyn Turcotte2013-06-193-4/+33
| | | | | | | | | 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.
* Make ninja detection a bit more robustPierre Rossi2013-06-142-2/+13
| | | | | | | | 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.
* Rename remaining references of blinq to QtWebEngine.Jocelyn Turcotte2013-06-115-11/+11
|
* And shell is out !Pierre Rossi2013-06-101-2/+0
| | | | | | | 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
* Fix undefined symbols in debug builds.Jocelyn Turcotte2013-06-103-0/+8
| | | | | | | 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.
* Replace Shell with WebContentsDelegateQt.Zeno Albisser2013-06-101-3/+0
|
* Allow excluding source files from the chromium buildPierre Rossi2013-06-032-0/+16
| | | | | | Use a gypi files for that with target defaults with our file exclusion patterns. Another patch bites the dust !
* Support commenting out the Q_OBJECT macroPierre Rossi2013-06-031-0/+15
| | | | We shouldn't try to run moc on such files...
* Ensure we only generate one moc action per filePierre Rossi2013-06-031-1/+4
|
* Fix moc-generating actions missing a trailing ','Pierre Rossi2013-05-311-1/+1
|
* Fix a typo in the error message when CHROMIUM_SRC_DIR isn't setPierre Rossi2013-05-311-1/+1
|
* Ease the switching between Debug and Release buildsPierre Rossi2013-05-314-7/+29
| | | | | | | | 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.
* Rename gypi_gen to gyp_generatorPierre Rossi2013-05-311-0/+0
| | | | | technically it's more correct now that we don't even bother and generate the .gyp file directly.
* Implement moc-ing through the gyp actions mechanismPierre Rossi2013-05-224-0/+65
| | | | And subsequently clean up the manually checked-in moc file.
* Re-introduce use of the dop level dirPierre Rossi2013-05-131-2/+5
| | | | | | This reverts commit 0e7244d61e01ab4f2e3532d274115903eae7a3d7 with a few improvements. We now need to patch the shipped version of gyp in tools/gyp.
* Partially revert b14f507b353048feffe9710b6172e4a7bce74b4dZeno Albisser2013-05-061-2/+2
| | | | | | 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.
* fix paths in gyp_blinq to fit new blink scripts pathZeno Albisser2013-05-061-1/+1
|
* Fix Release vs. debug buildsPierre Rossi2013-05-021-0/+4
| | | | | | 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.
* Define blinq_process path at compile timePierre Rossi2013-05-023-4/+9
| | | | | | | 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
* Revert "Make it possible to do shared library builds"Simon Hausmann2013-05-021-1/+1
| | | | | | This reverts commit 6d4e28f380d81eebeabac139c7f8e25de53ddee8. GYP_DEFINES does the same job :)
* Make it possible to do shared library buildsSimon Hausmann2013-05-021-1/+1
| | | | Until a developer-build option is in place, you can do export GYP_FLAGS="-Dcomponent=shared_library"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 13:42:05 +0000