summaryrefslogtreecommitdiff
path: root/build/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Moving sources to src part 1: Move files.Jocelyn Turcotte2013-11-283-142/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This only move files without adjusting any paths. This moves: - lib/quick -> src/webengine/api (API files) lib/quick -> src/webengine (other files) This contains the main QtWebEngine module library since <ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>. - lib/widgets -> src/webenginewidgets Also rename this directory to match its module name and rename Api to api. - lib -> src/core - process -> src/process - resources -> src/core/resources - tools/* -> tools/scripts/ The build directory is spread as follow: - build/build.pro -> src/core/gyp_run.pro - build/qmake_extras/* -> src/core/ (for the host and target .pro files) - build/qmake -> tools/qmake - Build related scripts -> tools/buildscripts Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add command line flags to init-repository.pyAndras Becsi2013-08-211-4/+3
| | | | | | | | | | | | | | | | This patch adds --upstream (-u) and --snapshot (-s) flags to the init-repository script which make it possible to choose the Chromium sources to use when building QtWebEngine. The default is to use the upstream submodules. This option is persisted with git config and used throughout the build system. This patch also keeps support for the CHROMIUM_SRC_DIR env variable which can be used to specify external Chromium sources which are assumed to be set up for the build and thus left untouched by the script. Change-Id: Ic83984199770076f90867f1b22a63b220bfe7359 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Adjust all the needed paths when using upstream repositoriesAndras Becsi2013-08-201-0/+2
| | | | | | | | 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-171-1/+1
| | | | | | | | | | 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>
* 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>
* Use Q_PRIVATE_SLOT for QWebContentsViewPrivate.Jocelyn Turcotte2013-06-191-0/+13
| | | | | | | | | 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.
* 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
|
* Implement moc-ing through the gyp actions mechanismPierre Rossi2013-05-221-0/+8
And subsequently clean up the manually checked-in moc file.
View Lorry Controller Status