From 8fb1dbef9c6606b49371f4c7baa8a21419146990 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 19 Apr 2017 11:12:10 +0200
Subject: [PATCH] Move qmake files to standard locations
The tools/qmake directory is a left over from webkit where qmake was
but one of many buildsystems. This is not necessary for qtwebengine, so
we can instead use the standard locations.
Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
.qmake.conf | 2 --
.../config.tests => config.tests}/alsa/alsa.pro | 0
.../config.tests => config.tests}/alsa/alsatest.cpp | 0
.../qmake/config.tests => config.tests}/khr/khr.cpp | 0
.../qmake/config.tests => config.tests}/khr/khr.pro | 0
.../config.tests => config.tests}/libvpx/libvpx.cpp | 0
.../config.tests => config.tests}/libvpx/libvpx.pro | 0
.../config.tests => config.tests}/snappy/snappy.cpp | 0
.../config.tests => config.tests}/snappy/snappy.pro | 0
.../config.tests => config.tests}/srtp/srtp.cpp | 0
.../config.tests => config.tests}/srtp/srtp.pro | 0
.../winversion/winversion.cpp | 0
.../winversion/winversion.pro | 0
configure.json | 2 --
.../qmake/mkspecs => mkspecs}/features/configure.prf | 2 +-
.../mkspecs => mkspecs}/features/default_pre.prf | 0
.../qmake/mkspecs => mkspecs}/features/functions.prf | 0
.../mkspecs => mkspecs}/features/gn_generator.prf | 0
qtwebengine.pro | 12 ++++++------
19 files changed, 7 insertions(+), 11 deletions(-)
rename {tools/qmake/config.tests => config.tests}/alsa/alsa.pro (100%)
rename {tools/qmake/config.tests => config.tests}/alsa/alsatest.cpp (100%)
rename {tools/qmake/config.tests => config.tests}/khr/khr.cpp (100%)
rename {tools/qmake/config.tests => config.tests}/khr/khr.pro (100%)
rename {tools/qmake/config.tests => config.tests}/libvpx/libvpx.cpp (100%)
rename {tools/qmake/config.tests => config.tests}/libvpx/libvpx.pro (100%)
rename {tools/qmake/config.tests => config.tests}/snappy/snappy.cpp (100%)
rename {tools/qmake/config.tests => config.tests}/snappy/snappy.pro (100%)
rename {tools/qmake/config.tests => config.tests}/srtp/srtp.cpp (100%)
rename {tools/qmake/config.tests => config.tests}/srtp/srtp.pro (100%)
rename {tools/qmake/config.tests => config.tests}/winversion/winversion.cpp (100%)
rename {tools/qmake/config.tests => config.tests}/winversion/winversion.pro (100%)
rename {tools/qmake/mkspecs => mkspecs}/features/configure.prf (99%)
rename {tools/qmake/mkspecs => mkspecs}/features/default_pre.prf (100%)
rename {tools/qmake/mkspecs => mkspecs}/features/functions.prf (100%)
rename {tools/qmake/mkspecs => mkspecs}/features/gn_generator.prf (100%)
diff --git a/.qmake.conf b/.qmake.conf
index a988f0fac..71d8c7d74 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,3 @@
-QMAKEPATH += $$PWD/tools/qmake
-
# Resolve root directories for sources
QTWEBENGINE_ROOT = $$PWD
QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
diff --git a/tools/qmake/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro
similarity index 100%
rename from tools/qmake/config.tests/alsa/alsa.pro
rename to config.tests/alsa/alsa.pro
diff --git a/tools/qmake/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
similarity index 100%
rename from tools/qmake/config.tests/alsa/alsatest.cpp
rename to config.tests/alsa/alsatest.cpp
diff --git a/tools/qmake/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp
similarity index 100%
rename from tools/qmake/config.tests/khr/khr.cpp
rename to config.tests/khr/khr.cpp
diff --git a/tools/qmake/config.tests/khr/khr.pro b/config.tests/khr/khr.pro
similarity index 100%
rename from tools/qmake/config.tests/khr/khr.pro
rename to config.tests/khr/khr.pro
diff --git a/tools/qmake/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp
similarity index 100%
rename from tools/qmake/config.tests/libvpx/libvpx.cpp
rename to config.tests/libvpx/libvpx.cpp
diff --git a/tools/qmake/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro
similarity index 100%
rename from tools/qmake/config.tests/libvpx/libvpx.pro
rename to config.tests/libvpx/libvpx.pro
diff --git a/tools/qmake/config.tests/snappy/snappy.cpp b/config.tests/snappy/snappy.cpp
similarity index 100%
rename from tools/qmake/config.tests/snappy/snappy.cpp
rename to config.tests/snappy/snappy.cpp
diff --git a/tools/qmake/config.tests/snappy/snappy.pro b/config.tests/snappy/snappy.pro
similarity index 100%
rename from tools/qmake/config.tests/snappy/snappy.pro
rename to config.tests/snappy/snappy.pro
diff --git a/tools/qmake/config.tests/srtp/srtp.cpp b/config.tests/srtp/srtp.cpp
similarity index 100%
rename from tools/qmake/config.tests/srtp/srtp.cpp
rename to config.tests/srtp/srtp.cpp
diff --git a/tools/qmake/config.tests/srtp/srtp.pro b/config.tests/srtp/srtp.pro
similarity index 100%
rename from tools/qmake/config.tests/srtp/srtp.pro
rename to config.tests/srtp/srtp.pro
diff --git a/tools/qmake/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp
similarity index 100%
rename from tools/qmake/config.tests/winversion/winversion.cpp
rename to config.tests/winversion/winversion.cpp
diff --git a/tools/qmake/config.tests/winversion/winversion.pro b/config.tests/winversion/winversion.pro
similarity index 100%
rename from tools/qmake/config.tests/winversion/winversion.pro
rename to config.tests/winversion/winversion.pro
diff --git a/configure.json b/configure.json
index 605807a36..0c9a1de64 100644
--- a/configure.json
+++ b/configure.json
@@ -4,8 +4,6 @@
"printsupport"
],
- "testDir": "tools/qmake/config.tests",
-
"commandline": {
"options": {
"alsa": "boolean",
diff --git a/tools/qmake/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
similarity index 99%
rename from tools/qmake/mkspecs/features/configure.prf
rename to mkspecs/features/configure.prf
index 55a7c45a4..f60be817c 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -11,7 +11,7 @@ defineTest(runConfigure) {
# Ignore the cached config tests results in case they were not successful
CONFIG += recheck
#Override the config.tests path
- QMAKE_CONFIG_TESTS_DIR = $$QTWEBENGINE_ROOT/tools/qmake/config.tests
+ QMAKE_CONFIG_TESTS_DIR = $$QTWEBENGINE_ROOT/config.tests
CONFIG_TESTS = $$files($$QMAKE_CONFIG_TESTS_DIR/*.pro, true)
log("Running configure tests$${EOL}")
for(test, CONFIG_TESTS) {
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
similarity index 100%
rename from tools/qmake/mkspecs/features/default_pre.prf
rename to mkspecs/features/default_pre.prf
diff --git a/tools/qmake/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
similarity index 100%
rename from tools/qmake/mkspecs/features/functions.prf
rename to mkspecs/features/functions.prf
diff --git a/tools/qmake/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
similarity index 100%
rename from tools/qmake/mkspecs/features/gn_generator.prf
rename to mkspecs/features/gn_generator.prf
diff --git a/qtwebengine.pro b/qtwebengine.pro
index b6e735876..c8f3555e3 100644
--- a/qtwebengine.pro
+++ b/qtwebengine.pro
@@ -16,9 +16,9 @@ isPlatformSupported() {
OTHER_FILES = \
tools/buildscripts/* \
tools/scripts/* \
- tools/qmake/config.tests/khr/* \
- tools/qmake/config.tests/libcap/* \
- tools/qmake/config.tests/libvpx/* \
- tools/qmake/config.tests/snappy/* \
- tools/qmake/config.tests/srtp/* \
- tools/qmake/mkspecs/features/*
+ config.tests/khr/* \
+ config.tests/libcap/* \
+ config.tests/libvpx/* \
+ config.tests/snappy/* \
+ config.tests/srtp/* \
+ mkspecs/features/*
--
GitLab