diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-11-14 11:52:51 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-11-14 14:04:10 +0000 |
| commit | 2e26894fdd2d4593bee6ab9062f64a1f4210d619 (patch) | |
| tree | 44dd8ee8cf3f293658b1c5dce4f20929f14b5267 /src/extras/defaults/qforwardrenderer.cpp | |
| parent | 5ea9d74d70f995f69567f2a8c4145872c6a905b8 (diff) | |
Fix resource init namespace issues
Follow the pattern from other modules and put Q_INIT_RESOURCES in a static function
outside all namespaces. INTEGRITY reportedly has linking issues without this.
Task-number: QTBUG-64468
Change-Id: Iccdd03f5384765251a94502766a445a6c6d732b0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/extras/defaults/qforwardrenderer.cpp')
| -rw-r--r-- | src/extras/defaults/qforwardrenderer.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp index 4ab63c980..b02077298 100644 --- a/src/extras/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -48,6 +48,13 @@ #include <Qt3DRender/qfrustumculling.h> #include <Qt3DRender/qrendersurfaceselector.h> +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(extras); +#endif +} + QT_BEGIN_NAMESPACE using namespace Qt3DRender; @@ -68,9 +75,7 @@ void QForwardRendererPrivate::init() { Q_Q(QForwardRenderer); -#ifdef QT_STATIC - Q_INIT_RESOURCE(extras); -#endif + initResources(); m_frustumCulling->setParent(m_clearBuffer); m_clearBuffer->setParent(m_cameraSelector); |