diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-27 01:00:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-27 01:00:36 +0100 |
| commit | ec5e692c1c4d8576d19723bb1193703275efdc90 (patch) | |
| tree | 976b6844203d60d4bf0b4c65dcfaf8eba7621506 /configure.pri | |
| parent | f91d1e08099e67c77c8d7bcda362f07eec054ae8 (diff) | |
| parent | ba13c6c08f30a4c2f188f69deeaf4ca6a020d7a1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I04afffdce6b78856d0301eb583f21d334c7466b0
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index 3f3d2da571..8f155787e0 100644 --- a/configure.pri +++ b/configure.pri @@ -121,8 +121,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 } } @@ -1318,6 +1317,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 \"$@\"" |