diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-14 12:38:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-07 19:53:32 +0000 |
| commit | 19a73086082bdf99f6f7b3b389c5e3f0703de449 (patch) | |
| tree | 1980b72be2356d0da96e7911c2cfe606346a3630 | |
| parent | 8684373c08a774a7ed23682a358de991b8775ddd (diff) | |
Move gn configs out of core
Change-Id: Ib047e35191faa627211c759bff4e81bfaec3d685
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | configure.pri | 2 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 6 | ||||
| -rw-r--r-- | src/buildtools/config/common.pri (renamed from src/core/config/common.pri) | 0 | ||||
| -rw-r--r-- | src/buildtools/config/functions.pri (renamed from src/core/config/functions.pri) | 0 | ||||
| -rw-r--r-- | src/buildtools/config/linux.pri (renamed from src/core/config/linux.pri) | 0 | ||||
| -rw-r--r-- | src/buildtools/config/mac_osx.pri (renamed from src/core/config/mac_osx.pri) | 0 | ||||
| -rw-r--r-- | src/buildtools/config/windows.pri (renamed from src/core/config/windows.pri) | 0 |
7 files changed, 4 insertions, 4 deletions
diff --git a/configure.pri b/configure.pri index 196c9abb1..eff7d8f61 100644 --- a/configure.pri +++ b/configure.pri @@ -1,4 +1,4 @@ -include(src/core/config/functions.pri) +include(src/buildtools/config/functions.pri) # this must be done outside any function QTWEBENGINE_SOURCE_TREE = $$PWD diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index e6c74fc87..a301929dc 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -70,9 +70,9 @@ defineReplace(gnPath) { } defineReplace(gnArgs) { - linux: include($$QTWEBENGINE_ROOT/src/core/config/linux.pri) - macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) - win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) + linux: include($$QTWEBENGINE_ROOT/src/buildtools/config/linux.pri) + macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri) + win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) return($$gn_args) } diff --git a/src/core/config/common.pri b/src/buildtools/config/common.pri index 1a54f1559..1a54f1559 100644 --- a/src/core/config/common.pri +++ b/src/buildtools/config/common.pri diff --git a/src/core/config/functions.pri b/src/buildtools/config/functions.pri index 8c11faa16..8c11faa16 100644 --- a/src/core/config/functions.pri +++ b/src/buildtools/config/functions.pri diff --git a/src/core/config/linux.pri b/src/buildtools/config/linux.pri index 998aedc40..998aedc40 100644 --- a/src/core/config/linux.pri +++ b/src/buildtools/config/linux.pri diff --git a/src/core/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri index 3f2fe9c0a..3f2fe9c0a 100644 --- a/src/core/config/mac_osx.pri +++ b/src/buildtools/config/mac_osx.pri diff --git a/src/core/config/windows.pri b/src/buildtools/config/windows.pri index dfa40e9dc..dfa40e9dc 100644 --- a/src/core/config/windows.pri +++ b/src/buildtools/config/windows.pri |