diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-19 11:12:10 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-02 13:57:05 +0000 |
commit | 8fb1dbef9c6606b49371f4c7baa8a21419146990 (patch) | |
tree | a925e98214dca11851cefda221ce7f176778e208 | |
parent | b53896d1e7f3cad971edd56f303a32058cefde48 (diff) |
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>
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | config.tests/alsa/alsa.pro (renamed from tools/qmake/config.tests/alsa/alsa.pro) | 0 | ||||
-rw-r--r-- | config.tests/alsa/alsatest.cpp (renamed from tools/qmake/config.tests/alsa/alsatest.cpp) | 0 | ||||
-rw-r--r-- | config.tests/khr/khr.cpp (renamed from tools/qmake/config.tests/khr/khr.cpp) | 0 | ||||
-rw-r--r-- | config.tests/khr/khr.pro (renamed from tools/qmake/config.tests/khr/khr.pro) | 0 | ||||
-rw-r--r-- | config.tests/libvpx/libvpx.cpp (renamed from tools/qmake/config.tests/libvpx/libvpx.cpp) | 0 | ||||
-rw-r--r-- | config.tests/libvpx/libvpx.pro (renamed from tools/qmake/config.tests/libvpx/libvpx.pro) | 0 | ||||
-rw-r--r-- | config.tests/snappy/snappy.cpp (renamed from tools/qmake/config.tests/snappy/snappy.cpp) | 0 | ||||
-rw-r--r-- | config.tests/snappy/snappy.pro (renamed from tools/qmake/config.tests/snappy/snappy.pro) | 0 | ||||
-rw-r--r-- | config.tests/srtp/srtp.cpp (renamed from tools/qmake/config.tests/srtp/srtp.cpp) | 0 | ||||
-rw-r--r-- | config.tests/srtp/srtp.pro (renamed from tools/qmake/config.tests/srtp/srtp.pro) | 0 | ||||
-rw-r--r-- | config.tests/winversion/winversion.cpp (renamed from tools/qmake/config.tests/winversion/winversion.cpp) | 0 | ||||
-rw-r--r-- | config.tests/winversion/winversion.pro (renamed from tools/qmake/config.tests/winversion/winversion.pro) | 0 | ||||
-rw-r--r-- | configure.json | 2 | ||||
-rw-r--r-- | mkspecs/features/configure.prf (renamed from tools/qmake/mkspecs/features/configure.prf) | 2 | ||||
-rw-r--r-- | mkspecs/features/default_pre.prf (renamed from tools/qmake/mkspecs/features/default_pre.prf) | 0 | ||||
-rw-r--r-- | mkspecs/features/functions.prf (renamed from tools/qmake/mkspecs/features/functions.prf) | 0 | ||||
-rw-r--r-- | mkspecs/features/gn_generator.prf (renamed from tools/qmake/mkspecs/features/gn_generator.prf) | 0 | ||||
-rw-r--r-- | qtwebengine.pro | 12 |
19 files changed, 7 insertions, 11 deletions
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 index 7322b6fb8..7322b6fb8 100644 --- a/tools/qmake/config.tests/alsa/alsa.pro +++ b/config.tests/alsa/alsa.pro diff --git a/tools/qmake/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp index ea511cd21..ea511cd21 100644 --- a/tools/qmake/config.tests/alsa/alsatest.cpp +++ b/config.tests/alsa/alsatest.cpp diff --git a/tools/qmake/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp index df81bd6b2..df81bd6b2 100644 --- a/tools/qmake/config.tests/khr/khr.cpp +++ b/config.tests/khr/khr.cpp diff --git a/tools/qmake/config.tests/khr/khr.pro b/config.tests/khr/khr.pro index b8e935f5a..b8e935f5a 100644 --- a/tools/qmake/config.tests/khr/khr.pro +++ b/config.tests/khr/khr.pro diff --git a/tools/qmake/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp index 258790309..258790309 100644 --- a/tools/qmake/config.tests/libvpx/libvpx.cpp +++ b/config.tests/libvpx/libvpx.cpp diff --git a/tools/qmake/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro index aff6d1857..aff6d1857 100644 --- a/tools/qmake/config.tests/libvpx/libvpx.pro +++ b/config.tests/libvpx/libvpx.pro diff --git a/tools/qmake/config.tests/snappy/snappy.cpp b/config.tests/snappy/snappy.cpp index d52c73bd0..d52c73bd0 100644 --- a/tools/qmake/config.tests/snappy/snappy.cpp +++ b/config.tests/snappy/snappy.cpp diff --git a/tools/qmake/config.tests/snappy/snappy.pro b/config.tests/snappy/snappy.pro index 890174a13..890174a13 100644 --- a/tools/qmake/config.tests/snappy/snappy.pro +++ b/config.tests/snappy/snappy.pro diff --git a/tools/qmake/config.tests/srtp/srtp.cpp b/config.tests/srtp/srtp.cpp index 7dfcc832a..7dfcc832a 100644 --- a/tools/qmake/config.tests/srtp/srtp.cpp +++ b/config.tests/srtp/srtp.cpp diff --git a/tools/qmake/config.tests/srtp/srtp.pro b/config.tests/srtp/srtp.pro index 2151d64aa..2151d64aa 100644 --- a/tools/qmake/config.tests/srtp/srtp.pro +++ b/config.tests/srtp/srtp.pro diff --git a/tools/qmake/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp index 3a7b67212..3a7b67212 100644 --- a/tools/qmake/config.tests/winversion/winversion.cpp +++ b/config.tests/winversion/winversion.cpp diff --git a/tools/qmake/config.tests/winversion/winversion.pro b/config.tests/winversion/winversion.pro index dc501a2f6..dc501a2f6 100644 --- a/tools/qmake/config.tests/winversion/winversion.pro +++ b/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 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 index c7440fa7a..c7440fa7a 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf diff --git a/tools/qmake/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index eb421f8b5..eb421f8b5 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf diff --git a/tools/qmake/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index 91c045cfa..91c045cfa 100644 --- a/tools/qmake/mkspecs/features/gn_generator.prf +++ b/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/* |