From c39f9f627159649fe7b00503a1a3a5cb58c923e0 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Mon, 10 Feb 2014 00:59:51 -0800
Subject: [PATCH] Fix (hopefully) for Windows runtime error.

---
 libraries/metavoxels/src/MetavoxelUtil.cpp | 31 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/libraries/metavoxels/src/MetavoxelUtil.cpp b/libraries/metavoxels/src/MetavoxelUtil.cpp
index e59cf0fe21..c6f8f5451e 100644
--- a/libraries/metavoxels/src/MetavoxelUtil.cpp
+++ b/libraries/metavoxels/src/MetavoxelUtil.cpp
@@ -11,12 +11,12 @@
 #include <QDoubleSpinBox>
 #include <QFormLayout>
 #include <QHBoxLayout>
+#include <QItemEditorCreatorBase>
 #include <QItemEditorFactory>
 #include <QLineEdit>
 #include <QMetaType>
 #include <QPushButton>
 #include <QScriptEngine>
-#include <QStandardItemEditorCreator>
 #include <QVBoxLayout>
 #include <QtDebug>
 
@@ -76,27 +76,48 @@ static QItemEditorFactory* getItemEditorFactory() {
     return factory;
 }
 
+/// Because Windows doesn't necessarily have the staticMetaObject available when we want to create,
+/// this class simply delays the value property name lookup until actually requested.
+template<class T> class LazyItemEditorCreator : public QItemEditorCreatorBase {
+public:
+    
+    virtual QWidget* createWidget(QWidget* parent) const { return new T(parent); }
+    
+    virtual QByteArray valuePropertyName() const;
+
+protected:
+    
+    QByteArray _valuePropertyName;
+};
+
+template<class T> QByteArray LazyItemEditorCreator<T>::valuePropertyName() const {
+    if (_valuePropertyName.isNull()) {
+        const_cast<LazyItemEditorCreator<T>*>(this)->_valuePropertyName = T::staticMetaObject.userProperty().name();
+    }
+    return _valuePropertyName;    
+}
+
 static QItemEditorCreatorBase* createDoubleEditorCreator() {
-    QItemEditorCreatorBase* creator = new QStandardItemEditorCreator<DoubleEditor>();
+    QItemEditorCreatorBase* creator = new LazyItemEditorCreator<DoubleEditor>();
     getItemEditorFactory()->registerEditor(qMetaTypeId<double>(), creator);
     getItemEditorFactory()->registerEditor(qMetaTypeId<float>(), creator);
     return creator;
 }
 
 static QItemEditorCreatorBase* createQColorEditorCreator() {
-    QItemEditorCreatorBase* creator = new QStandardItemEditorCreator<QColorEditor>();
+    QItemEditorCreatorBase* creator = new LazyItemEditorCreator<QColorEditor>();
     getItemEditorFactory()->registerEditor(qMetaTypeId<QColor>(), creator);
     return creator;
 }
 
 static QItemEditorCreatorBase* createVec3EditorCreator() {
-    QItemEditorCreatorBase* creator = new QStandardItemEditorCreator<Vec3Editor>();
+    QItemEditorCreatorBase* creator = new LazyItemEditorCreator<Vec3Editor>();
     getItemEditorFactory()->registerEditor(qMetaTypeId<glm::vec3>(), creator);
     return creator;
 }
 
 static QItemEditorCreatorBase* createParameterizedURLEditorCreator() {
-    QItemEditorCreatorBase* creator = new QStandardItemEditorCreator<ParameterizedURLEditor>();
+    QItemEditorCreatorBase* creator = new LazyItemEditorCreator<ParameterizedURLEditor>();
     getItemEditorFactory()->registerEditor(qMetaTypeId<ParameterizedURL>(), creator);
     return creator;
 }