Browse Source

Merge pull request #6595 from patrickelectric/qml_compiler

qgroundcontrol: Use qtquickcompiler by default
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
85672ca82c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      qgroundcontrol.pro

2
qgroundcontrol.pro

@ -56,7 +56,6 @@ iOSBuild {
error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.") error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.")
} }
QT += qml-private QT += qml-private
CONFIG += qtquickcompiler
QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist
OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist
} else { } else {
@ -203,6 +202,7 @@ LinuxBuild {
CONFIG += qt \ CONFIG += qt \
thread \ thread \
c++11 \ c++11 \
qtquickcompiler \
contains(DEFINES, ENABLE_VERBOSE_OUTPUT) { contains(DEFINES, ENABLE_VERBOSE_OUTPUT) {
message("Enable verbose compiler output (manual override from command line)") message("Enable verbose compiler output (manual override from command line)")

Loading…
Cancel
Save