Skip to content

Q
qgroundcontrol
Unverified Commit 85672ca8 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6595 from patrickelectric/qml_compiler 

qgroundcontrol: Use qtquickcompiler by default
parents e2785eb5 0bbbaa43
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
qgroundcontrol.pro
View file @ 85672ca8
...@@ -56,7 +56,6 @@ iOSBuild { ...@@ -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 { ...@@ -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)")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment