From 48afcf97b45a2f2729e5ff29a7d9d9ec71958a13 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Wed, 8 Nov 2017 13:45:26 +0100
Subject: Fix shader graph metatypes for static builds

Cannot rely on Q_COREAPP_STARTUP_FUNCTION inside Qt since static builds
have to be fully supported. Due to not registering those types, the shader
builder silently generated incompilable shader code in static builds. This
is critical especially on platforms where static builds are the only
choice (INTEGRITY).

Task-number: QTBUG-64365
Change-Id: I8820ded239ac160ab00c7fc34918fd3f273f0afb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/gui/util/qshadergraphloader.cpp |  3 +++
 src/gui/util/qshaderlanguage.cpp    | 14 ++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp
index c7560d9105..8d92c73a5a 100644
--- a/src/gui/util/qshadergraphloader.cpp
+++ b/src/gui/util/qshadergraphloader.cpp
@@ -48,10 +48,13 @@
 
 QT_BEGIN_NAMESPACE
 
+void qt_register_ShaderLanguage_enums();
+
 QShaderGraphLoader::QShaderGraphLoader() Q_DECL_NOTHROW
     : m_status(Null),
       m_device(nullptr)
 {
+    qt_register_ShaderLanguage_enums();
 }
 
 QShaderGraphLoader::Status QShaderGraphLoader::status() const Q_DECL_NOTHROW
diff --git a/src/gui/util/qshaderlanguage.cpp b/src/gui/util/qshaderlanguage.cpp
index 4a0da5bfb5..f9192f5ff3 100644
--- a/src/gui/util/qshaderlanguage.cpp
+++ b/src/gui/util/qshaderlanguage.cpp
@@ -43,14 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace {
-    void registerEnums()
-    {
-        qRegisterMetaType<QShaderLanguage::StorageQualifier>();
-        qRegisterMetaType<QShaderLanguage::VariableType>();
-    }
+// Note: to be invoked explicitly. Relying for example on
+// Q_COREAPP_STARTUP_FUNCTION would not be acceptable in static builds.
+void qt_register_ShaderLanguage_enums()
+{
+    qRegisterMetaType<QShaderLanguage::StorageQualifier>();
+    qRegisterMetaType<QShaderLanguage::VariableType>();
 }
 
-Q_COREAPP_STARTUP_FUNCTION(registerEnums)
-
 QT_END_NAMESPACE
-- 
cgit v1.2.3