From bec8b75b8a2a3574053036fa6ce0992176c304f5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 12 Oct 2018 15:34:36 +0200
Subject: configure: make config.status work for in-source builds on unix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib2a62e71a88f46836c10b0d9c47da5ad1f98d413
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 configure.pri | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index 64ed6b9ed8..e04a7a24cd 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1303,6 +1303,7 @@ defineTest(createConfigStatus) {
         cont = \
             "$$system_quote($$system_path($$cfg)$$ext) -redo %*"
     } else {
+        !contains(cfg, .*/.*): cfg = ./$$cfg
         cont = \
             "$${LITERAL_HASH}!/bin/sh" \
             "exec $$system_quote($$cfg) -redo \"$@\""
-- 
cgit v1.2.3


From 4e6a3c7def9b634ccb79a5ba3010d8df0d6fdae3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 15 Oct 2018 11:02:12 +0200
Subject: configure: fix license determination failure message

we don't check for licheck at this stage any more.
amends 60e56f167.

Change-Id: I4f8d57100796dce99bd605835b25a954a6359d30
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 configure.pri | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index e04a7a24cd..b3b3e27c44 100644
--- a/configure.pri
+++ b/configure.pri
@@ -106,8 +106,7 @@ defineReplace(qtConfFunc_licenseCheck) {
             }
         } else {
             !$$hasCommercial: \
-                qtConfFatalError("No license files and no licheck executables found." \
-                                 "Cannot proceed. Try re-installing Qt.")
+                qtConfFatalError("No license files. Cannot proceed. Try re-installing Qt.")
             commercial = yes
         }
     }
-- 
cgit v1.2.3