Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
85672ca8
Unverified
Commit
85672ca8
authored
Jun 16, 2018
by
Don Gagne
Committed by
GitHub
Jun 16, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6595 from patrickelectric/qml_compiler
qgroundcontrol: Use qtquickcompiler by default
parents
e2785eb5
0bbbaa43
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
qgroundcontrol.pro
qgroundcontrol.pro
+1
-1
No files found.
qgroundcontrol.pro
View file @
85672ca8
...
...
@@ -56,7 +56,6 @@ iOSBuild {
error
(
"Error building .plist file. 'ForAppStore' builds are only possible through the official build system."
)
}
QT
+=
qml
-
private
CONFIG
+=
qtquickcompiler
QMAKE_INFO_PLIST
=
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
OTHER_FILES
+=
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
}
else
{
...
...
@@ -203,6 +202,7 @@ LinuxBuild {
CONFIG
+=
qt
\
thread
\
c
++
11
\
qtquickcompiler
\
contains
(
DEFINES
,
ENABLE_VERBOSE_OUTPUT
)
{
message
(
"Enable verbose compiler output (manual override from command line)"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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