Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge issue

Browse source
This commit is contained in:
Brad Davis 2019-02-06 13:06:04 -08:00
parent 3331a8ad43
commit b40595b14f
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/ui/src/ui/OffscreenQmlSurface.cpp
View file

@ -248,16 +248,6 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect"); 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 // Register the pixmap Security Image Provider
engine->addImageProvider(SecurityImageProvider::PROVIDER_NAME, new SecurityImageProvider()); engine->addImageProvider(SecurityImageProvider::PROVIDER_NAME, new SecurityImageProvider());