Fix merge issue

This commit is contained in:
Brad Davis 2019-02-06 13:06:04 -08:00
parent 3331a8ad43
commit b40595b14f

View file

@ -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());