From 51faca98a24ec597be759c371edb216c1efa0b7b Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 5 Feb 2018 13:17:09 -0500 Subject: [PATCH] qmake use absolute paths instead of relative --- qgroundcontrol.pro | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 43bb37c29..ecb2a9729 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -7,14 +7,16 @@ # License terms set in COPYING.md # ------------------------------------------------- +QMAKE_PROJECT_DEPTH = 0 # undocumented qmake flag to force absolute paths in make files + exists($${OUT_PWD}/qgroundcontrol.pro) { error("You must use shadow build (e.g. mkdir build; cd build; qmake ../qgroundcontrol.pro).") } message(Qt version $$[QT_VERSION]) -!equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 6) { - error("Unsupported Qt version, 5.7+ is required") +!equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 8) { + error("Unsupported Qt version, 5.9+ is required") } include(QGCCommon.pri) @@ -207,8 +209,7 @@ contains(DEFINES, ENABLE_VERBOSE_OUTPUT) { } else:exists(user_config.pri):infile(user_config.pri, DEFINES, ENABLE_VERBOSE_OUTPUT) { message("Enable verbose compiler output (manual override from user_config.pri)") } else { -CONFIG += \ - silent + CONFIG += silent } QT += \ -- 2.22.0