diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-15 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-15 16:29:40 +0100 |
| commit | adc7bbe910a4b89a579ffa93da5a937cfc1379f4 (patch) | |
| tree | e28a2fadc82652798302cc7f79a6f4310a2eb8d7 /configure.pri | |
| parent | 14bb413309092adc53e8451daff5690c4698c07d (diff) | |
| parent | c15a069830baf87f57c84e86326cf86ba9a39713 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/gui/rhi/qshader.cpp
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index e717a5d305..fe8656acb5 100644 --- a/configure.pri +++ b/configure.pri @@ -609,8 +609,11 @@ defineTest(qtConfOutput_prepareOptions) { qtConfAddNote("Available Android host does not match host architecture.") } } else { - !exists($$ndk_tc_pfx/$$ndk_host/*): \ - qtConfFatalError("Specified Android NDK host is invalid.") + !exists($$ndk_tc_pfx/$$ndk_host/*) { + err = "Specified Android NDK host '$$ndk_host' is invalid. Expected files in the following directory to exist:" + err += '$${ndk_tc_pfx}/$${ndk_host}/' + qtConfFatalError($$err) + } } android_abis = $$eval(config.input.android-abis) |