mirror of
https://gitlab.com/eql/lqml.git
synced 2025-12-06 02:30:38 -08:00
revisions regarding iOS and latest Xcode
This commit is contained in:
parent
8b24889bcd
commit
a64e53bb59
4 changed files with 4 additions and 9 deletions
|
|
@ -94,16 +94,16 @@ QVariant QT::connectDocumentChanged(const QVariant& vDocument, const QVariant& v
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef Q_OS_IOS
|
|
||||||
QVariant QT::connectKeyPressed() {
|
QVariant QT::connectKeyPressed() {
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
GuiApplication* sender = static_cast<GuiApplication*>(qGuiApp);
|
GuiApplication* sender = static_cast<GuiApplication*>(qGuiApp);
|
||||||
connect(sender, &GuiApplication::keyPressed,
|
connect(sender, &GuiApplication::keyPressed,
|
||||||
[](const QString& key, const QString& objectName) {
|
[](const QString& key, const QString& objectName) {
|
||||||
ecl_fun("editor:key-pressed", key, objectName);
|
ecl_fun("editor:key-pressed", key, objectName);
|
||||||
});
|
});
|
||||||
|
#endif
|
||||||
return QVariant();
|
return QVariant();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
// methods
|
// methods
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,7 @@ public:
|
||||||
|
|
||||||
// connect
|
// connect
|
||||||
Q_INVOKABLE QVariant connectDocumentChanged(const QVariant&, const QVariant&);
|
Q_INVOKABLE QVariant connectDocumentChanged(const QVariant&, const QVariant&);
|
||||||
#ifdef Q_OS_IOS
|
|
||||||
Q_INVOKABLE QVariant connectKeyPressed();
|
Q_INVOKABLE QVariant connectKeyPressed();
|
||||||
#endif
|
|
||||||
|
|
||||||
// methods
|
// methods
|
||||||
Q_INVOKABLE QVariant block2 (const QVariant&);
|
Q_INVOKABLE QVariant block2 (const QVariant&);
|
||||||
|
|
|
||||||
|
|
@ -132,10 +132,7 @@ ios {
|
||||||
LIBS += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
|
LIBS += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
|
||||||
LIBS += -L../../../platforms/ios/lib
|
LIBS += -L../../../platforms/ios/lib
|
||||||
|
|
||||||
# OpenSSL libs not included here, required for downloading map tiles
|
# note: SSL on Qt side works out of the box on iOS
|
||||||
# either build them by yourself or find a trusted source for downloading,
|
|
||||||
# and put them here: '../../../platforms/ios/lib/'
|
|
||||||
LIBS += -lcrypto -lssl
|
|
||||||
|
|
||||||
SOURCES += cpp/ios.mm
|
SOURCES += cpp/ios.mm
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -118,9 +118,9 @@ public:
|
||||||
}
|
}
|
||||||
return QGuiApplication::eventFilter(object, event);
|
return QGuiApplication::eventFilter(object, event);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void keyPressed(const QString&, const QString&);
|
void keyPressed(const QString&, const QString&);
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue