Need A HELP!!!!!

.gitignore

@@ -0,0 +1,22 @@
+/doc/
+/generated_cpp/
+/plugins/
+/qtbindings/*/debug/
+/qtbindings/*/release/
+/qtbindings/Makefile
+/qtbindings/*/Makefile
+/qtbindings/*/Makefile.Debug
+/qtbindings/*/Makefile.Release
+/generator/.preprocessed.tmp
+/qtbindings/qs_eval/qs_eval
+
+*.log
+*.o
+qtbindings/*/moc_*.cpp
+
+/generator/generator
+/generator/Makefile
+/generator/Makefile.Debug
+/generator/Makefile.Release
+/generator/release/
+.qmake.stash

README

@@ -1,7 +1,7 @@
 Qt Script Generator labs package, version 0.2
 
-
-The Qt Script Generator is a tool that generates Qt bindings for Qt Script.
+The Qt Script Generator is a tool that generates Qt bindings for Qt Script. This should work
+with Qt 5.6.0/5.7.0 (tested with 5.7.0+ICU) and MSVC 2015 Update 3.
 
 ---
 

generator/abstractmetabuilder.cpp

@@ -313,21 +313,21 @@ void AbstractMetaBuilder::traverseStreamOperator(FunctionModelItem item)
 }
 
 void AbstractMetaBuilder::fixQObjectForScope(TypeDatabase *types,
-					 NamespaceModelItem scope)
+                                         NamespaceModelItem scope)
 {
     foreach (ClassModelItem item, scope->classes()) {
         QString qualified_name = item->qualifiedName().join("::");
         TypeEntry *entry = types->findType(qualified_name);
         if (entry) {
-	    if (isQObject(qualified_name) && entry->isComplex()) {
+            if (isQObject(qualified_name) && entry->isComplex()) {
                 ((ComplexTypeEntry *) entry)->setQObject(true);
-	    }
-	}
+            }
+        }
     }
 
     foreach (NamespaceModelItem item, scope->namespaceMap().values()) {
         if (scope != item)
-	  fixQObjectForScope(types, item);
+          fixQObjectForScope(types, item);
     }
 }
 
@@ -876,9 +876,13 @@ void AbstractMetaBuilder::figureOutDefaultEnumArguments()
                             if (classes.front() != 0) {
                                 classes << classes.front()->baseClass();
 
+                                qDebug() << "Search enum value '" << expr << "' in '" << meta_class->name() << "' and its super classes";
+
                                 AbstractMetaClassList interfaces = classes.front()->interfaces();
-                                foreach (AbstractMetaClass *interface, interfaces)
-                                    classes << interface->primaryInterfaceImplementor();
+                                foreach (AbstractMetaClass *interface, interfaces) {
+                                    if(classes.front() != interface->primaryInterfaceImplementor())
+                                        classes << interface->primaryInterfaceImplementor();
+                                }
 
                                 e = classes.front()->findEnumForValue(expr);
                             }
@@ -1524,7 +1528,7 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(FunctionModelItem fu
     if (!meta_function->isAbstract())
         *meta_function += AbstractMetaAttributes::Native;
 
-    if (!function_item->isVirtual())
+    if (!function_item->isVirtual() && !meta_function->isAbstract())
         *meta_function += AbstractMetaAttributes::Final;
 
     if (function_item->isInvokable())
@@ -1799,7 +1803,7 @@ AbstractMetaType *AbstractMetaBuilder::translateType(const TypeInfo &_typei, boo
                 return t;
 
             ClassModelItem item = m_dom->findClass(contexts.at(0));
-            if (item != 0)
+            if (item)
                 contexts += item->baseClasses();
             contexts.pop_front();
 

generator/abstractmetalang.cpp

@@ -53,7 +53,7 @@ AbstractMetaType *AbstractMetaType::copy() const
     cpy->setConstant(isConstant());
     cpy->setReference(isReference());
     cpy->setIndirections(indirections());
-	cpy->setInstantiations(instantiations());
+        cpy->setInstantiations(instantiations());
     cpy->setArrayElementCount(arrayElementCount());
     cpy->setOriginalTypeDescription(originalTypeDescription());
     cpy->setOriginalTemplateType(originalTemplateType() ? originalTemplateType()->copy() : 0);
@@ -439,7 +439,7 @@ bool AbstractMetaFunction::resetObjectAfterUse(int argument_idx) const
         QList<ArgumentModification> argumentModifications = modification.argument_mods;
         foreach (ArgumentModification argumentModification, argumentModifications) {
             if (argumentModification.index == argument_idx && argumentModification.reset_after_use)
-                return true;            
+                return true;
         }
     }
 
@@ -1169,7 +1169,7 @@ QPropertySpec *AbstractMetaClass::propertySpecForReset(const QString &name) cons
 static bool functions_contains(const AbstractMetaFunctionList &l, const AbstractMetaFunction *func)
 {
     foreach (const AbstractMetaFunction *f, l) {
-		if ((f->compareTo(func) & AbstractMetaFunction::PrettySimilar) == AbstractMetaFunction::PrettySimilar)
+                if ((f->compareTo(func) & AbstractMetaFunction::PrettySimilar) == AbstractMetaFunction::PrettySimilar)
             return true;
     }
     return false;
@@ -1862,19 +1862,63 @@ QString AbstractMetaType::minimalSignature() const
     if (isConstant())
         minimalSignature += "const ";
     minimalSignature += typeEntry()->qualifiedCppName();
-    if (hasInstantiations()) {
+    if (hasInstantiationInCpp()) {
         QList<AbstractMetaType *> instantiations = this->instantiations();
         minimalSignature += "<";
         for (int i=0;i<instantiations.size();++i) {
             if (i > 0)
                 minimalSignature += ",";
             minimalSignature += instantiations.at(i)->minimalSignature();
         }
-        minimalSignature += ">";
+        minimalSignature += " >";
     }
 
+    for (int j=0; j<indirections(); ++j)
+        minimalSignature += "*";
     if (isReference())
         minimalSignature += "&";
+
+    return minimalSignature;
+}
+
+QString AbstractMetaType::minimalRef2PtrSignature() const
+{
+    QString minimalSignature;
+//    if (isConstant())
+//        minimalSignature += "const ";
+    minimalSignature += typeEntry()->qualifiedCppName();
+    if (hasInstantiationInCpp()) {
+        QList<AbstractMetaType *> instantiations = this->instantiations();
+        minimalSignature += "<";
+        for (int i=0;i<instantiations.size();++i) {
+            if (i > 0)
+                minimalSignature += ",";
+            minimalSignature += instantiations.at(i)->minimalSignature();
+        }
+        minimalSignature += " >";
+    }
+
+    for (int j=0; j<actualIndirections(); ++j)
+        minimalSignature += "*";
+
+    return minimalSignature;
+}
+
+QString AbstractMetaType::minimalNoRefNoConstSignature() const
+{
+    QString minimalSignature;
+    minimalSignature += typeEntry()->qualifiedCppName();
+    if (hasInstantiationInCpp()) {
+        QList<AbstractMetaType *> instantiations = this->instantiations();
+        minimalSignature += "<";
+        for (int i=0;i<instantiations.size();++i) {
+            if (i > 0)
+                minimalSignature += ",";
+            minimalSignature += instantiations.at(i)->minimalSignature();
+        }
+        minimalSignature += " >";
+    }
+
     for (int j=0; j<indirections(); ++j)
         minimalSignature += "*";
 

generator/abstractmetalang.h

@@ -203,12 +203,14 @@ class AbstractMetaType
     // true when use pattern is container
     bool hasInstantiations() const { return !m_instantiations.isEmpty(); }
     void addInstantiation(AbstractMetaType *inst) { m_instantiations << inst; }
-	void setInstantiations(const QList<AbstractMetaType *> &insts) { m_instantiations = insts; }
+    void setInstantiations(const QList<AbstractMetaType *> &insts) { m_instantiations = insts; }
     QList<AbstractMetaType *> instantiations() const { return m_instantiations; }
     void setInstantiationInCpp(bool incpp) { m_cpp_instantiation = incpp; }
     bool hasInstantiationInCpp() const { return hasInstantiations() && m_cpp_instantiation; }
 
     QString minimalSignature() const;
+    QString minimalRef2PtrSignature() const;
+    QString minimalNoRefNoConstSignature() const;
 
     // true when the type is a QtJambiObject subclass
     bool hasNativeId() const;

generator/build_all.txt

@@ -1,13 +1,14 @@
 <typesystem>
   <load-typesystem name="typesystem_core.xml" generate="yes" />
   <load-typesystem name="typesystem_gui.xml" generate="yes" />
+  <load-typesystem name="typesystem_printsupport.xml" generate="yes" />
+  <load-typesystem name="typesystem_widgets.xml" generate="yes" />
+  <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
   <load-typesystem name="typesystem_sql.xml" generate="yes" />
   <load-typesystem name="typesystem_opengl.xml" generate="yes" />
   <load-typesystem name="typesystem_svg.xml" generate="yes" />
   <load-typesystem name="typesystem_network.xml" generate="yes" />
   <load-typesystem name="typesystem_xml.xml" generate="yes" />
-  <load-typesystem name="typesystem_phonon.xml" generate="yes" />
-  <load-typesystem name="typesystem_webkit.xml" generate="yes" />
   <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
   <load-typesystem name="typesystem_uitools.xml" generate="yes" />
 </typesystem>

generator/build_printsupport.txt

@@ -0,0 +1,6 @@
+<typesystem>
+  <load-typesystem name="typesystem_core.xml" generate="no" />
+  <load-typesystem name="typesystem_gui.xml" generate="no" />
+  <load-typesystem name="typesystem_widgets.xml" generate="no" />
+  <load-typesystem name="typesystem_printsupport.xml" generate="yes" />
+</typesystem>