diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
| commit | ccf12049b662fe1b03b5b0ea199d29b32f072eda (patch) | |
| tree | 43e3d0042eb1f8ba23349e10c9c7e547fab57fec /src/core/core_module.pro | |
| parent | 56714be7d05afb94c63b658a4fdb2bedd1bee645 (diff) | |
| parent | 471d484bea6b8b84749b8d89c603cb8394f1b5ee (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index f30af83fc..174c00afb 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -77,9 +77,9 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat INSTALLS += icu locales resources } - !contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) { + !contains(QT_CONFIG, qt_framework):!force_independent { # - # Copy essential files to the qtbase build directory (for non-installed developer builds) + # Copy essential files to the qtbase build directory for non-prefix builds # icudt2build.input = icu.files @@ -97,3 +97,11 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat QMAKE_EXTRA_COMPILERS += icudt2build resources2build } } + +OTHER_FILES = \ + $$files(../3rdparty/chromium/*.h, true) \ + $$files(../3rdparty/chromium/*.cc, true) \ + $$files(../3rdparty/chromium/*.mm, true) \ + $$files(../3rdparty/chromium/*.py, true) \ + $$files(../3rdparty/chromium/*.gyp, true) \ + $$files(../3rdparty/chromium/*.gypi, true) |