Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 19:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login

Browse source
This commit is contained in:
Gabriel Calero 2018-05-02 17:23:25 -03:00
commit e4fdd81148
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.h
View file

@ -411,6 +411,7 @@ public slots:
Q_INVOKABLE void openAndroidActivity(const QString& activityName, const bool backToScene);
Q_INVOKABLE void performHapticFeedback(const QString& feedbackConstant);
private slots:
void onDesktopRootItemCreated(QQuickItem* qmlContext);
void onDesktopRootContextCreated(QQmlContext* qmlContext);