diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2023-07-07 09:09:40 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-07-17 13:23:02 +0200 |
| commit | a57fb4207057065360f8e9792727a67f2f9b5031 (patch) | |
| tree | 1074d002d2c67297becaf3f4332a6607cbb64655 /examples/demos/FX_Material_Showroom/src | |
| parent | 091ce579db7bda6b09edaea2d8185ffd5c2d3708 (diff) | |
Fix build of FX Material Showroom example on Windows
* Shorten the file names for *plugin.cpp by specifying
a CLASS_NAME.
* Add sources from Qt Design Studio components instead
of cloning from qtquickdesigner-components.git. This
avoids issues with the very deep directory structure
of above repository.
While at it, move also the MaterialBundle plugin from
asset_imports to just imports.
Task-number: QTBUG-115108
Pick-to: 6.5 6.6
Change-Id: I63d5fde474fbda93cfabec20e2349854755cc4cb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'examples/demos/FX_Material_Showroom/src')
| -rw-r--r-- | examples/demos/FX_Material_Showroom/src/import_qml_plugins.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/demos/FX_Material_Showroom/src/import_qml_plugins.h b/examples/demos/FX_Material_Showroom/src/import_qml_plugins.h index 9a31eefd5..4531fe632 100644 --- a/examples/demos/FX_Material_Showroom/src/import_qml_plugins.h +++ b/examples/demos/FX_Material_Showroom/src/import_qml_plugins.h @@ -5,4 +5,6 @@ Q_IMPORT_QML_PLUGIN(contentPlugin) Q_IMPORT_QML_PLUGIN(PocketDemoPlugin) -Q_IMPORT_QML_PLUGIN(ComponentBundles_MaterialBundlePlugin) +Q_IMPORT_QML_PLUGIN(CB_MaterialBundlePlugin) +Q_IMPORT_QML_PLUGIN(QQS_ComponentsPlugin) +Q_IMPORT_QML_PLUGIN(QQS_AppPlugin) |