Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
51c09fdc
Commit
51c09fdc
authored
Aug 13, 2014
by
Don Gagne
Browse files
Merge pull request #823 from DonLakeFlyer/WindowsQUpgadeFix
Fix Windows QUpgrade on TeamCity
parents
22793563
cb0736ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
QGCExternalLibs.pri
View file @
51c09fdc
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment