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
1444ac27
Unverified
Commit
1444ac27
authored
Aug 21, 2018
by
Gus Grubba
Committed by
GitHub
Aug 21, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6799 from mavlink/customiOS
Allow a plugin to override iOS build settings.
parents
1e1f0ae8
9ae8151a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
23 deletions
+30
-23
qgroundcontrol.pro
qgroundcontrol.pro
+30
-23
No files found.
qgroundcontrol.pro
View file @
1444ac27
...
...
@@ -44,29 +44,6 @@ MacBuild {
}
}
iOSBuild
{
LIBS
+=
-
framework
AVFoundation
#--
Info
.
plist
(
need
an
"official"
one
for
the
App
Store
)
ForAppStore
{
message
(
App
Store
Build
)
#--
Create
official
,
versioned
Info
.
plist
APP_STORE
=
$$
system
(
cd
$$
{
BASEDIR
}
&&
$$
{
BASEDIR
}
/
tools
/
update_ios_version
.
sh
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
-
Source
.
plist
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
)
APP_ERROR
=
$$
find
(
APP_STORE
,
"Error"
)
count
(
APP_ERROR
,
1
)
{
error
(
"Error building .plist file. 'ForAppStore' builds are only possible through the official build system."
)
}
QT
+=
qml
-
private
QMAKE_INFO_PLIST
=
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
OTHER_FILES
+=
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
}
else
{
QMAKE_INFO_PLIST
=
$$
{
BASEDIR
}
/
ios
/
iOS
-
Info
.
plist
OTHER_FILES
+=
$$
{
BASEDIR
}
/
ios
/
iOS
-
Info
.
plist
}
QMAKE_ASSET_CATALOGS
+=
ios
/
Images
.
xcassets
BUNDLE
.
files
=
ios
/
QGCLaunchScreen
.
xib
$$
QMAKE_INFO_PLIST
QMAKE_BUNDLE_DATA
+=
BUNDLE
}
LinuxBuild
{
CONFIG
+=
qesp_linux_udev
}
...
...
@@ -132,6 +109,36 @@ WindowsBuild {
QMAKE_TARGET_PRODUCT
=
"$${QGC_APP_NAME}"
}
#-------------------------------------------------------------------------------------
#
iOS
iOSBuild
{
contains
(
CONFIG
,
DISABLE_BUILTIN_IOS
)
{
message
(
"Skipping builtin support for iOS"
)
}
else
{
LIBS
+=
-
framework
AVFoundation
#--
Info
.
plist
(
need
an
"official"
one
for
the
App
Store
)
ForAppStore
{
message
(
App
Store
Build
)
#--
Create
official
,
versioned
Info
.
plist
APP_STORE
=
$$
system
(
cd
$$
{
BASEDIR
}
&&
$$
{
BASEDIR
}
/
tools
/
update_ios_version
.
sh
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
-
Source
.
plist
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
)
APP_ERROR
=
$$
find
(
APP_STORE
,
"Error"
)
count
(
APP_ERROR
,
1
)
{
error
(
"Error building .plist file. 'ForAppStore' builds are only possible through the official build system."
)
}
QT
+=
qml
-
private
QMAKE_INFO_PLIST
=
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
OTHER_FILES
+=
$$
{
BASEDIR
}
/
ios
/
iOSForAppStore
-
Info
.
plist
}
else
{
QMAKE_INFO_PLIST
=
$$
{
BASEDIR
}
/
ios
/
iOS
-
Info
.
plist
OTHER_FILES
+=
$$
{
BASEDIR
}
/
ios
/
iOS
-
Info
.
plist
}
QMAKE_ASSET_CATALOGS
+=
ios
/
Images
.
xcassets
BUNDLE
.
files
=
ios
/
QGCLaunchScreen
.
xib
$$
QMAKE_INFO_PLIST
QMAKE_BUNDLE_DATA
+=
BUNDLE
}
}
#
#
Plugin
configuration
#
...
...
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