re added compatibility with IOS 9.x
This commit is contained in:
parent
2a444b4532
commit
13bf3a57cd
4 changed files with 8 additions and 4 deletions
|
@ -67,6 +67,9 @@ win {
|
||||||
|
|
||||||
ios {
|
ios {
|
||||||
QMAKE_ASSET_CATALOGS += shared/Assets.xcassets
|
QMAKE_ASSET_CATALOGS += shared/Assets.xcassets
|
||||||
|
xcode_product_bundle_identifier_setting.value = "de.itsblue.fannyapp"
|
||||||
|
|
||||||
|
QMAKE_IOS_DEPLOYMENT_TARGET=9.0
|
||||||
|
|
||||||
OBJECTIVE_SOURCES += \
|
OBJECTIVE_SOURCES += \
|
||||||
sources/ios/docviewcontroller.mm \
|
sources/ios/docviewcontroller.mm \
|
||||||
|
|
|
@ -12,7 +12,7 @@ class IosShareUtils : public QObject
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit IosShareUtils(QObject *parent = 0);
|
explicit IosShareUtils();
|
||||||
bool checkMimeTypeView(const QString &mimeType);
|
bool checkMimeTypeView(const QString &mimeType);
|
||||||
bool checkMimeTypeEdit(const QString &mimeType);
|
bool checkMimeTypeEdit(const QString &mimeType);
|
||||||
void sendFile(const QString &filePath, const QString &title, const QString &mimeType, const int &requestId);
|
void sendFile(const QString &filePath, const QString &title, const QString &mimeType, const int &requestId);
|
||||||
|
@ -22,7 +22,7 @@ public:
|
||||||
signals:
|
signals:
|
||||||
void shareFinished(int requestCode);
|
void shareFinished(int requestCode);
|
||||||
void shareNoAppAvailable(int requestCode);
|
void shareNoAppAvailable(int requestCode);
|
||||||
void shareError(int requestCode, QString message);
|
//void shareError(int requestCode, QString message);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
#import "headers/ios/docviewcontroller.hpp"
|
#import "headers/ios/docviewcontroller.hpp"
|
||||||
|
|
||||||
IosShareUtils::IosShareUtils(QObject *parent) : QObject(parent)
|
IosShareUtils::IosShareUtils() : QObject(nullptr)
|
||||||
{
|
{
|
||||||
// Sharing Files from other iOS Apps I got the ideas and some code contribution from:
|
// Sharing Files from other iOS Apps I got the ideas and some code contribution from:
|
||||||
// Thomas K. Fischer (@taskfabric) - http://taskfabric.com - thx
|
// Thomas K. Fischer (@taskfabric) - http://taskfabric.com - thx
|
||||||
|
@ -68,7 +68,7 @@ void IosShareUtils::sendFile(const QString &filePath, const QString &title, cons
|
||||||
// [documentInteractionController presentPreviewAnimated:YES];
|
// [documentInteractionController presentPreviewAnimated:YES];
|
||||||
if(![documentInteractionController presentPreviewAnimated:YES])
|
if(![documentInteractionController presentPreviewAnimated:YES])
|
||||||
{
|
{
|
||||||
emit shareError(0, tr("No App found to open: %1").arg(filePath));
|
//emit shareError(0, tr("No App found to open: %1").arg(filePath));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
#include <QQmlApplicationEngine>
|
#include <QQmlApplicationEngine>
|
||||||
#include <QtQml/QQmlContext>
|
#include <QtQml/QQmlContext>
|
||||||
|
|
||||||
#include "headers/serverconn.h"
|
#include "headers/serverconn.h"
|
||||||
#include "headers/appsettings.h"
|
#include "headers/appsettings.h"
|
||||||
#include "headers/foodplanmodel.h"
|
#include "headers/foodplanmodel.h"
|
||||||
|
|
Reference in a new issue