From 19a73086082bdf99f6f7b3b389c5e3f0703de449 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 14 Aug 2019 12:38:32 +0200
Subject: [PATCH] Move gn configs out of core
Change-Id: Ib047e35191faa627211c759bff4e81bfaec3d685
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
configure.pri | 2 +-
mkspecs/features/functions.prf | 6 +++---
src/{core => buildtools}/config/common.pri | 0
src/{core => buildtools}/config/functions.pri | 0
src/{core => buildtools}/config/linux.pri | 0
src/{core => buildtools}/config/mac_osx.pri | 0
src/{core => buildtools}/config/windows.pri | 0
7 files changed, 4 insertions(+), 4 deletions(-)
rename src/{core => buildtools}/config/common.pri (100%)
rename src/{core => buildtools}/config/functions.pri (100%)
rename src/{core => buildtools}/config/linux.pri (100%)
rename src/{core => buildtools}/config/mac_osx.pri (100%)
rename src/{core => buildtools}/config/windows.pri (100%)
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
similarity index 100%
rename from src/core/config/common.pri
rename to src/buildtools/config/common.pri
diff --git a/src/core/config/functions.pri b/src/buildtools/config/functions.pri
similarity index 100%
rename from src/core/config/functions.pri
rename to src/buildtools/config/functions.pri
diff --git a/src/core/config/linux.pri b/src/buildtools/config/linux.pri
similarity index 100%
rename from src/core/config/linux.pri
rename to src/buildtools/config/linux.pri
diff --git a/src/core/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri
similarity index 100%
rename from src/core/config/mac_osx.pri
rename to src/buildtools/config/mac_osx.pri
diff --git a/src/core/config/windows.pri b/src/buildtools/config/windows.pri
similarity index 100%
rename from src/core/config/windows.pri
rename to src/buildtools/config/windows.pri
--
GitLab