From 2f3109e4beb86222227fcd89d53211626184407e Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 28 Jun 2017 11:00:05 -0700
Subject: [PATCH] move the location of
 Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can
 see it

---
 libraries/shared/src/RegisteredMetaTypes.cpp | 2 ++
 libraries/shared/src/RegisteredMetaTypes.h   | 2 ++
 libraries/ui/src/ui/OffscreenQmlSurface.cpp  | 6 ------
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index 1e5fe23458..b30637c83f 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -37,6 +37,8 @@ int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
 int collisionMetaTypeId = qRegisterMetaType<Collision>();
 int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
 int socketErrorMetaTypeId = qRegisterMetaType<QAbstractSocket::SocketError>();
+int voidLambdaType = qRegisterMetaType<std::function<void()>>();
+int variantLambdaType = qRegisterMetaType<std::function<QVariant()>>();
 
 void registerMetaTypes(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, mat4toScriptValue, mat4FromScriptValue);
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index dd37cb3410..123c769a96 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -34,6 +34,8 @@ Q_DECLARE_METATYPE(xColor)
 Q_DECLARE_METATYPE(QVector<glm::vec3>)
 Q_DECLARE_METATYPE(QVector<float>)
 Q_DECLARE_METATYPE(AACube)
+Q_DECLARE_METATYPE(std::function<void()>);
+Q_DECLARE_METATYPE(std::function<QVariant()>);
 
 void registerMetaTypes(QScriptEngine* engine);
 
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index f0006cb399..648bdad1bf 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -886,12 +886,6 @@ QQmlContext* OffscreenQmlSurface::getSurfaceContext() {
     return _qmlContext;
 }
 
-Q_DECLARE_METATYPE(std::function<void()>);
-auto VoidLambdaType = qRegisterMetaType<std::function<void()>>();
-Q_DECLARE_METATYPE(std::function<QVariant()>);
-auto VariantLambdaType = qRegisterMetaType<std::function<QVariant()>>();
-
-
 void OffscreenQmlSurface::executeOnUiThread(std::function<void()> function, bool blocking ) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "executeOnUiThread", blocking ? Qt::BlockingQueuedConnection : Qt::QueuedConnection,