diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-06-30 18:05:25 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-07-18 19:46:42 +0000 |
| commit | f22973008dc7c0c7d91257e46d9a15f903724f0d (patch) | |
| tree | 950847d075618ec3856ba7a58379ae423e9f17f0 /src/qml/qml/qqmlimport.cpp | |
| parent | a62637358f23546a9edef397fd4d5869a16f0645 (diff) | |
wasm: rename Q_OS_HTML5 to Q_OS_WASM to reflect qtbasewip/webassembly
Change-Id: I088ae6e7d7c16a88cc6bcf2eb97898db83df4724
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index bfbfd2e76a..9f7fa624d1 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1756,7 +1756,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) { filePluginPath << QLatin1String("."); // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM // Hardcode the qml imports to "qml/" relative to the app nexe. // This should perhaps be set via Qml2Imports in qt.conf. QString installImportsPath = QStringLiteral("qml/"); |