From 6d0878db1be77c212fecccd6506e1872134c68cd Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 29 Jun 2018 17:34:14 +0200
Subject: [PATCH] configure: move qtConfTest_verifySpec() out of
 qt_configure.prf

the callback is specific to qtbase/configure.json, so it belongs into
qtbase/configure.pri.

amends d90db0f136.

Change-Id: I905f985e2d3d2e42c4587cbacdea8dc3eb09a5be
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 configure.pri                     | 5 +++++
 mkspecs/features/qt_configure.prf | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.pri b/configure.pri
index 5200ad13422..27dc60a09cb 100644
--- a/configure.pri
+++ b/configure.pri
@@ -251,6 +251,11 @@ defineTest(qtConfTest_machineTuple) {
     return(true)
 }
 
+defineTest(qtConfTest_verifySpec) {
+    qtConfTest_compile($$1): return(true)
+    qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
+}
+
 defineTest(qtConfTest_architecture) {
     !qtConfTest_compile($${1}): \
         error("Could not determine $$eval($${1}.label). See config.log for details.")
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index a61cae9ece3..0f1ec7a20f9 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1033,11 +1033,6 @@ defineTest(qtConfTest_compile) {
     return(false)
 }
 
-defineTest(qtConfTest_verifySpec) {
-    qtConfTest_compile($$1): return(true)
-    qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
-}
-
 defineTest(qtConfTest_files) {
     for(i, $${1}.files._KEYS_) {
         f = $$eval($${1}.files.$${i})