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
b1940863
Commit
b1940863
authored
Nov 11, 2015
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Done for the time being
parent
dd8a2dab
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
QGCApplication.pro
QGCApplication.pro
+3
-5
qgroundcontrol.pro
qgroundcontrol.pro
+6
-0
QGCApplication.cc
src/QGCApplication.cc
+8
-0
No files found.
QGCApplication.pro
View file @
b1940863
...
...
@@ -33,7 +33,7 @@ LinuxBuild {
CONFIG
+=
link_pkgconfig
}
#
QGC
QtLocation
plugin
#
QGC
QtLocation
plugin
(
for
ios
,
it's all compiled in with the rest.)
!ios {
LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
...
...
@@ -86,10 +86,8 @@ MacBuild {
iOSBuild {
QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist
ios_icon
.
files
=
$$
files
(
$$
PWD
/
ios
/
AppIcon
*.
png
)
QMAKE_BUNDLE_DATA
+=
ios_icon
app_launch_images
.
files
=
$$
PWD
/
ios
/
LaunchScreen
.
xib
QMAKE_BUNDLE_DATA
+=
app_launch_images
BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/LaunchScreen.xib
QMAKE_BUNDLE_DATA += BUNDLE
#-- TODO: Add iTunesArtwork
}
...
...
qgroundcontrol.pro
View file @
b1940863
...
...
@@ -28,9 +28,15 @@ message(Qt version $$[QT_VERSION])
}
ios
{
#--
Qmake
can't handle a project within a project when generating
# an Xcode project. You end up with one project for the app and
# nothing for the location plugin.
include($$PWD/src/QtLocationPlugin/QGCLocationPlugin.pro)
include($$PWD/QGCApplication.pro)
} else {
#-- The rest (make files or Visual Studio projects) works. Note
# that by default, we're
using
make
files
for
Mac
OS
too
.
If
#
you
want
an
Xcode
project
,
the
same
above
applies
.
TEMPLATE
=
subdirs
SUBDIRS
=
.
/
src
/
QtLocationPlugin
/
QGCLocationPlugin
.
pro
SUBDIRS
+=
.
/
QGCApplication
.
pro
...
...
src/QGCApplication.cc
View file @
b1940863
...
...
@@ -291,7 +291,15 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
this
->
setApplicationVersion
(
versionString
);
// Set settings format
#if !defined(__mobile__) && !defined(__macos__)
QSettings
::
setDefaultFormat
(
QSettings
::
IniFormat
);
#else
QString
settingsLocation
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
ConfigLocation
);
if
(
!
settingsLocation
.
isEmpty
())
{
QSettings
::
setPath
(
QSettings
::
NativeFormat
,
QSettings
::
UserScope
,
settingsLocation
);
}
#endif
QSettings
settings
;
qDebug
()
<<
"Settings location"
<<
settings
.
fileName
()
<<
settings
.
isWritable
();
...
...
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