From cb0736ce090406a239f51dc2452ec517bb8c9a3a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 13 Aug 2014 11:13:11 -0700 Subject: [PATCH] Fix Windows QUpgrade on TeamCity --- QGCExternalLibs.pri | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 9c9e1d82a..0429c44ab 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -19,7 +19,9 @@ else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_QUPGRADE) message("Skipping support for QUpgrade (manual override from user_config.pri)") } # If the QUpgrade submodule has been initialized, build in support by default. -else:exists(qupgrade/.git) { +# We look for the existence of qupgrade.pro for the check. We can't look for a .git file +# because that breaks the TeamCity build process which does not use repositories. +else:exists(qupgrade/qupgrade.pro) { message("Including support for QUpgrade") DEFINES += QGC_QUPGRADE_ENABLED -- 2.22.0