mirror of
https://github.com/lubosz/overte.git
synced 2025-04-08 04:42:20 +02:00
Fix merge issue
This commit is contained in:
parent
3331a8ad43
commit
b40595b14f
1 changed files with 0 additions and 10 deletions
|
@ -248,16 +248,6 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
|
|||
qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
|
||||
});
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
auto fileSelector = QQmlFileSelector::get(engine);
|
||||
if (fileSelector) {
|
||||
auto selectors = fileSelector->selector()->extraSelectors();
|
||||
if (!selectors.contains(HIFI_ANDROID_APP)) {
|
||||
fileSelector->setExtraSelectors(QStringList() << HIFI_ANDROID_APP);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Register the pixmap Security Image Provider
|
||||
engine->addImageProvider(SecurityImageProvider::PROVIDER_NAME, new SecurityImageProvider());
|
||||
|
||||
|
|
Loading…
Reference in a new issue