diff options
| -rw-r--r-- | qtwebengine.pro | 41 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 6 |
2 files changed, 34 insertions, 13 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index e8a2c5754..3c7b2e980 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -1,21 +1,44 @@ -TEMPLATE = subdirs +load(qt_parts) -CONFIG += ordered +TEMPLATE = subdirs # The first three subdirs contain dummy .pro files that are used by qmake # to generate a corresponding .gyp file -SUBDIRS = build/qmake_extras \ # Phony pro file that extracts things like compiler and linker from qmake + +# 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. +shared.depends = qmake_extras +lib.depends = qmake_extras +process.depends = qmake_extras + +# API libraries +quick_lib.subdir = lib/quick +quick_lib.target = sub-quick-lib +quick_lib.depends = build +widgets_lib.subdir = lib/widgets +widgets_lib.target = sub-widgets-lib +widgets_lib.depends = build + +sub_examples.depends = quick_lib +sub_tests.depends = quick_lib + +# This is where we use the generated gypi files and run gyp_qtwebengine +build.depends = resources shared lib process + +SUBDIRS += qmake_extras \ resources \ shared \ lib \ process \ - build \ # This is where we use the generated qt_generated.gypi and run gyp - # Now build the API libraries - lib/quick + build \ + quick_lib qtHaveModule(widgets) { - SUBDIRS += \ - lib/widgets \ + SUBDIRS += widgets_lib + sub_examples.depends += widgets_lib + sub_tests.depends += widgets_lib } # Ninja executable location needs to be determined early for extra targets. Should be fetched from cache most of the time anyway. @@ -32,5 +55,3 @@ debug.depends: qmake QMAKE_EXTRA_TARGETS += release \ debug - -load(qt_parts) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 30f0cbb03..1ae65f98b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,4 +1,4 @@ -TEMPLATE=subdirs -SUBDIRS=\ - widgets +TEMPLATE = subdirs + +qtHaveModule(widgets): SUBDIRS = widgets |