diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-23 20:11:17 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-13 18:55:52 +0000 |
| commit | e58eb3d6f953c224c2d47cd344bc41ba9f499223 (patch) | |
| tree | f7f8db1514ad1b8a1e374af9d84850591a913a6b /mkspecs/devices/common | |
| parent | e2eab15e34181d81bac26613ab72c03240402bf8 (diff) | |
| download | qtbase-e58eb3d6f953c224c2d47cd344bc41ba9f499223.tar.gz | |
move device spec validation to configure
instead of letting the specs validate themselves on each call, let them
only define a callback for use by the verifyspec configure test. this
is somewhat faster, and allows them to be loaded before qdevice.pri is
populated.
Change-Id: I2b60d006b33bbf42c28949f10ad429520ed32f46
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/devices/common')
| -rw-r--r-- | mkspecs/devices/common/linux_device_post.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/devices/common/linux_device_post.conf b/mkspecs/devices/common/linux_device_post.conf index 88fa31d805..cf1608f32b 100644 --- a/mkspecs/devices/common/linux_device_post.conf +++ b/mkspecs/devices/common/linux_device_post.conf @@ -1,3 +1,7 @@ +defineTest(qtConfSanitizeMkspec) { + deviceSanityCheckCompiler() +} + contains(DISTRO_OPTS, deb-multi-arch) { QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/$${GCC_MACHINE_DUMP} \ -Wl,-rpath-link,$$[QT_SYSROOT]/lib/$${GCC_MACHINE_DUMP} @@ -10,5 +14,3 @@ contains(DISTRO_OPTS, boot2qt) { QMAKE_CFLAGS += $$COMPILER_FLAGS QMAKE_CXXFLAGS += $$COMPILER_FLAGS QMAKE_LFLAGS += $$LINKER_FLAGS - -deviceSanityCheckCompiler() |