diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-29 13:06:38 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-29 13:06:38 +0200 |
| commit | 1cd5d7bd3c922e3162d7c70a6a9cfc43d9fa9564 (patch) | |
| tree | 2527459b1ad5e2e8c111b6528d9d2a1d94109062 /src | |
| parent | 2ed6d17c0b03cacd00dc35ec71ae29c0cfb7d552 (diff) | |
Fix our fake project
Since we use our configuration in core_common.pri, we should include it
there to ensure we don't miss it somewhere.
Task-number: QTCREATORBUG-22315
Change-Id: I9c35dd850d76486e7c787613e7508c03d6f42b2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core_chromium.pri | 5 | ||||
| -rw-r--r-- | src/core/core_common.pri | 3 | ||||
| -rw-r--r-- | src/core/core_generator.pro | 2 | ||||
| -rw-r--r-- | src/core/core_gn_config.pri | 3 | ||||
| -rw-r--r-- | src/core/core_project.pro | 4 |
5 files changed, 6 insertions, 11 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index d8ef25d8c..35d677770 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -1,10 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) -QT_FOR_CONFIG += webenginecore webenginecore-private - qtConfig(debug_and_release): CONFIG += debug_and_release -include(core_common.pri) - macos { # This fixes namespace builds on macOS. Specifically namespace ambiguity issues between Qt and # Chromium forward declarations of NSString. diff --git a/src/core/core_common.pri b/src/core/core_common.pri index 51f5e21b0..c92278657 100644 --- a/src/core/core_common.pri +++ b/src/core/core_common.pri @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +QT_FOR_CONFIG += webenginecore webenginecore-private + # NOTE: The TARGET, QT, QT_PRIVATE variables are used in both core_module.pro and core_gyp_generator.pro # gyp/ninja will take care of the compilation, qmake/make will finish with linking and install. diff --git a/src/core/core_generator.pro b/src/core/core_generator.pro index 916c211f9..935c653a4 100644 --- a/src/core/core_generator.pro +++ b/src/core/core_generator.pro @@ -1,3 +1,5 @@ +include(core_common.pri) + include(core_gn_config.pri) TEMPLATE = lib diff --git a/src/core/core_gn_config.pri b/src/core/core_gn_config.pri index b76cdc81a..a089eecd0 100644 --- a/src/core/core_gn_config.pri +++ b/src/core/core_gn_config.pri @@ -1,6 +1,3 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) -QT_FOR_CONFIG += webenginecore webenginecore-private - CONFIG = gn_generator $$CONFIG GN_SRC_DIR = $$PWD GN_FILE = $$OUT_PWD/$$getConfigDir()/BUILD.gn diff --git a/src/core/core_project.pro b/src/core/core_project.pro index 3205ac604..9c8e20808 100644 --- a/src/core/core_project.pro +++ b/src/core/core_project.pro @@ -1,10 +1,8 @@ TEMPLATE = lib # Fake project to make QtCreator happy. -include(core_chromium.pri) +include(core_common.pri) -HEADERS = -SOURCES = linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri |