summaryrefslogtreecommitdiffstats
path: root/qtwebengine.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fix qmake -r by moving load(qt_parts) to the end of the projectAndras Becsi2013-11-151-2/+3
| | | | | | | | | This is an issue for non-developer builds of Qt where the forwarding headers have to be generated before processing the examples project files. Change-Id: I683227c97a763c48b8ab090580f37f7134680c59 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Use explicit dependencies to specify build orderAndras Becsi2013-10-251-10/+31
| | | | | | | Explicit dependencies make proper parallel builds possible. Change-Id: I71f7d7fbee1244490dfcb040bb4145ab74d5c416 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Build fix for the Widgets tests can be running by make check.Adam Kallai2013-10-161-3/+2
| | | | | Change-Id: Ic5ec80679f19235f441108e99e06d489ff2cabc3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Rename findNinja to findOrBuildNinja and fail early if gyp failsAndras Becsi2013-10-011-1/+1
| | | | | | | | | We should not not use the $$ syntax to collect the output of the gyp call instead we should just fail with an error in case gyp_qtwebengine fails. Change-Id: Ib6218bdfb998100a3717470713ed5bf5f30db339 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Allow overriding target compiler and linker with qmake's oneAndras Becsi2013-10-011-1/+2
| | | | | | | | | | | | Using make_global_settings, we can pass along the compiler and linker that qmake uses, still allowing overriding it through environment variables. We generate qmake_extras.gypi and populated with the host and target compilers so that it also works when cross compiling. Based on patch by Pierre Rossi <pierre.rossi@digia.com> Change-Id: Ia3789abeea88f4d3cde75c2cf07cc9de66d7afbf Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* API tests: Make them link.Jocelyn Turcotte2013-08-201-1/+6
| | | | | | | | | Add the tests to the build. Very few of the test cases pass already, but this should allow to progress on the implementation while fixing/unskipping those tests. Change-Id: Id96d22748f8effad963232c2451fb8719d299fee Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Split out the Widgets and QtQuick integrationPierre Rossi2013-07-311-1/+5
| | | | | | | | | | | | | | | 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>
* Add a python script to generate the chromium .pak resource files.Zeno Albisser2013-07-181-1/+2
| | | | | | | | 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>
* Split out the example into two distinct onesPierre Rossi2013-06-171-1/+1
| | | | Cleaner than deciding on startup with an env variable
* Make ninja detection a bit more robustPierre Rossi2013-06-141-2/+5
| | | | | | | | 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-111-0/+23
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 08:31:49 +0000