diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-13 10:46:43 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-13 10:47:04 +0100 |
| commit | bfb58a7fff934fde6f4c2b4c989f411b43aee8d9 (patch) | |
| tree | 432201a0c7fb6c49d7835f728fc0da97d8742b39 /src/render/materialsystem/shaderbuilder.cpp | |
| parent | f660c657092811e77aa0ffb8145d6b060464292c (diff) | |
| parent | d69e2c2b42719e6839f32e8ab796cf22d9f29bfa (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ib51c8311ce78b2fec62dd0c09cb943a85a7d0b2b
Diffstat (limited to 'src/render/materialsystem/shaderbuilder.cpp')
| -rw-r--r-- | src/render/materialsystem/shaderbuilder.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp index c2b32ce86..da1e6a713 100644 --- a/src/render/materialsystem/shaderbuilder.cpp +++ b/src/render/materialsystem/shaderbuilder.cpp @@ -51,6 +51,13 @@ #include <QFileInfo> #include <QUrl> +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(materialsystem); +#endif +} + QT_BEGIN_NAMESPACE class GlobalShaderPrototypes @@ -58,6 +65,7 @@ class GlobalShaderPrototypes public: GlobalShaderPrototypes() { + initResources(); setPrototypesFile(QStringLiteral(":/prototypes/default.json")); } |