From 1c5e30928bd3ec31747276ff60940ec144a2cc16 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 18 Nov 2013 14:23:25 +0100 Subject: Moving sources to src part 2: Adjust paths. NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi --- src/src.pro | 76 ++++++++++++++----------------------------------------------- 1 file changed, 17 insertions(+), 59 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index bc0151536..59fcce66f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,64 +1,22 @@ TEMPLATE = subdirs -# The first three subdirs contain dummy .pro files that are used by qmake -# to generate a corresponding .gyp file - -# Phony pro file that extracts things like compiler and linker from qmake -qmake_extras.subdir = build/qmake_extras - -# Phony pro files that generate gyp files. Will be built by ninja. -lib.depends = qmake_extras - -# API libraries -webengine_lib.subdir = lib/quick -webengine_lib.target = sub-webengine-lib -webengine_lib.depends = build -quick_plugin_lib.subdir = lib/quick/plugin -quick_plugin_lib.target = sub-quick-plugin-lib -quick_plugin_lib.depends = webengine_lib -quick_experimental_plugin_lib.subdir = lib/quick/plugin/experimental -quick_experimental_plugin_lib.target = sub-quick-experimental-plugin-lib -quick_experimental_plugin_lib.depends = webengine_lib -widgets_lib.subdir = lib/widgets -widgets_lib.target = sub-widgets-lib -widgets_lib.depends = build - -process.depends = build -sub_examples.depends = quick_plugin_lib quick_experimental_plugin_lib -sub_tests.depends = quick_plugin_lib quick_experimental_plugin_lib - -# This is where we use the generated gypi files and run gyp_qtwebengine -build.depends = resources lib - -SUBDIRS += qmake_extras \ - resources \ - lib \ - process \ - build \ - webengine_lib \ - quick_plugin_lib \ - quick_experimental_plugin_lib +process.depends = core +webengine.depends = core +webenginewidgets.depends = core +webengine_plugin.subdir = webengine/plugin +webengine_plugin.target = sub-webengine-plugin +webengine_plugin.depends = webengine +webengine_experimental_plugin.subdir = webengine/plugin/experimental +webengine_experimental_plugin.target = sub-webengine-experimental-plugin +webengine_experimental_plugin.depends = webengine + + +SUBDIRS += core \ + process \ + webengine \ + webengine_plugin \ + webengine_experimental_plugin qtHaveModule(widgets) { - SUBDIRS += widgets_lib - sub_examples.depends += widgets_lib - sub_tests.depends += widgets_lib + SUBDIRS += webenginewidgets } - -# Ninja executable location needs to be determined early for extra targets. Should be fetched from cache most of the time anyway. -NINJA_EXECUTABLE = $$findOrBuildNinja() - -# Extra targets that invoke ninja on the desired configuration added for convenience -release.target = release -release.commands = $$NINJA_EXECUTABLE -C $$getOutDir()/Release -release.depends: qmake - -debug.target = debug -debug.commands = $$NINJA_EXECUTABLE -C $$getOutDir()/Debug -debug.depends: qmake - -QMAKE_EXTRA_TARGETS += release \ - debug - -# Move this to the beginning of the project file as soon as we moved to the src layout -load(qt_parts) -- cgit v1.2.3