Commit 8fb1dbef authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

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: default avatarKai Koehne <kai.koehne@qt.io>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@qt.io>
parent b53896d1
No related merge requests found
Showing with 7 additions and 11 deletions
QMAKEPATH += $$PWD/tools/qmake
# Resolve root directories for sources
QTWEBENGINE_ROOT = $$PWD
QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
......
File moved
File moved
File moved
File moved
File moved
......@@ -4,8 +4,6 @@
"printsupport"
],
"testDir": "tools/qmake/config.tests",
"commandline": {
"options": {
"alsa": "boolean",
......
......@@ -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) {
......
......@@ -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/*
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment