diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-09-10 22:52:04 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-09-12 13:55:54 +0000 |
| commit | 607706b8abf51fafac12ecd78255e3fe451ef338 (patch) | |
| tree | 825141c95c60b3077ea42f9a665192c57a3535cd /src/qml/qml/qqmlimport.cpp | |
| parent | 1b9f0b1ef548a248c427b23fb7e4d161d7dc83bb (diff) | |
Remove hardcoded Q_OS_WASM “qml/” import path
The qrc resources path is sufficient for now.
This reverts parts of commit eb6201b2af725d64e5e92f19a512b1ff23ceba51
Change-Id: I400eb36edf0035f8ad6a4bbd04da9f81701bef89
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index ee6484f0b7..bc53b98b5b 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1774,14 +1774,8 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) { filePluginPath << QLatin1String("."); // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath -#ifndef Q_OS_WASM - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); -#else - // Hardcode the qml imports to "qml/" relative to the app exe. - // This should perhaps be set via Qml2Imports in qt.conf. - QString installImportsPath = QStringLiteral("qml/"); -#endif + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); addImportPath(installImportsPath); // env import paths |