Commit b1940863 authored by dogmaphobic's avatar dogmaphobic

Done for the time being

parent dd8a2dab
...@@ -33,7 +33,7 @@ LinuxBuild { ...@@ -33,7 +33,7 @@ LinuxBuild {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
} }
# QGC QtLocation plugin # QGC QtLocation plugin (for ios, it's all compiled in with the rest.)
!ios { !ios {
LIBS += -L$${LOCATION_PLUGIN_DESTDIR} LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
...@@ -86,10 +86,8 @@ MacBuild { ...@@ -86,10 +86,8 @@ MacBuild {
iOSBuild { iOSBuild {
QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist
ios_icon.files = $$files($$PWD/ios/AppIcon*.png) BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/LaunchScreen.xib
QMAKE_BUNDLE_DATA += ios_icon QMAKE_BUNDLE_DATA += BUNDLE
app_launch_images.files = $$PWD/ios/LaunchScreen.xib
QMAKE_BUNDLE_DATA += app_launch_images
#-- TODO: Add iTunesArtwork #-- TODO: Add iTunesArtwork
} }
......
...@@ -28,9 +28,15 @@ message(Qt version $$[QT_VERSION]) ...@@ -28,9 +28,15 @@ message(Qt version $$[QT_VERSION])
} }
ios { 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/src/QtLocationPlugin/QGCLocationPlugin.pro)
include($$PWD/QGCApplication.pro) include($$PWD/QGCApplication.pro)
} else { } 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 TEMPLATE = subdirs
SUBDIRS = ./src/QtLocationPlugin/QGCLocationPlugin.pro SUBDIRS = ./src/QtLocationPlugin/QGCLocationPlugin.pro
SUBDIRS += ./QGCApplication.pro SUBDIRS += ./QGCApplication.pro
......
...@@ -291,7 +291,15 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -291,7 +291,15 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
this->setApplicationVersion(versionString); this->setApplicationVersion(versionString);
// Set settings format // Set settings format
#if !defined(__mobile__) && !defined(__macos__)
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
#else
QString settingsLocation = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
if(!settingsLocation.isEmpty())
{
QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, settingsLocation);
}
#endif
QSettings settings; QSettings settings;
qDebug() << "Settings location" << settings.fileName() << settings.isWritable(); qDebug() << "Settings location" << settings.fileName() << settings.isWritable();
......
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