[Backport generator] Do not add copy constructor if it was deleted or private

obviously copying the object is explicitly prohibited

(cherry picked from commit MeVisLab/pythonqt@f6f00fe)

Author: usiems

generator/abstractmetabuilder.cpp

@@ -1109,8 +1109,15 @@ void AbstractMetaBuilder::traverseFunctions(ScopeModelItem scope_item, AbstractM
             bool isInvalidDestructor = meta_function->isDestructor() && meta_function->isPrivate();
             bool isInvalidConstructor = meta_function->isConstructor()
                 && (meta_function->isPrivate() || meta_function->isInvalid());
+            if (isInvalidConstructor && meta_function->arguments().size() == 1 &&
+              meta_class->qualifiedCppName() == meta_function->arguments().at(0)->type()->typeEntry()->qualifiedCppName())
+            {
+                // deleted or private copy constructor, it seems copying is not allowed
+                meta_class->typeEntry()->setNoCopy(true);
+            }
             if ((isInvalidDestructor || isInvalidConstructor)
-                && !meta_class->hasNonPrivateConstructor()) {
+                && !meta_class->hasNonPrivateConstructor())
+            {
                 *meta_class += AbstractMetaAttributes::Final;
             } else if (meta_function->isConstructor() && !meta_function->isPrivate()) {
                 *meta_class -= AbstractMetaAttributes::Final;
@@ -1434,11 +1441,6 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(FunctionModelItem fu
             meta_function->setFunctionType(AbstractMetaFunction::SlotFunction);
     }
 
-    if (function_item->isDeleted()) {
-      meta_function->setInvalid(true);
-      return meta_function;
-    }
-
     ArgumentList arguments = function_item->arguments();
     AbstractMetaArgumentList meta_arguments;
 
@@ -1494,7 +1496,7 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(FunctionModelItem fu
         }
     }
 
-    // If we where not able to translate the default argument make it
+    // If we were not able to translate the default argument make it
     // reset all default arguments before this one too.
     for (int i=0; i<first_default_argument; ++i) {
         meta_arguments[i]->setDefaultValueExpression(QString());
@@ -1506,6 +1508,11 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(FunctionModelItem fu
         }
     }
 
+    if (function_item->isDeleted()) {
+      meta_function->setInvalid(true);
+      return meta_function;
+    }
+
     return meta_function;
 }
 

generator/shellheadergenerator.cpp

@@ -364,7 +364,8 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
     }
 
     if (meta_class->typeEntry()->isValue()
-      && !copyConstructorSeen && defaultConstructorSeen) {
+      && !copyConstructorSeen && defaultConstructorSeen && !meta_class->typeEntry()->hasNoCopy())
+    {
       QString className = meta_class->generateShellClass() ? shellClassName(meta_class) : meta_class->qualifiedCppName();
       s << meta_class->qualifiedCppName() << "* new_" << meta_class->name() << "(const " << meta_class->qualifiedCppName() << "& other) {" << endl;
       s << className << "* a = new " << className << "();" << endl;

generator/typesystem.h

@@ -801,6 +801,7 @@ class ComplexTypeEntry : public TypeEntry
           m_generic_class(false),
           m_createShell(false),
           m_createPromoter(false),
+          m_noCopy(false),
           m_type_flags(0)
     {
         Include inc;
@@ -931,6 +932,9 @@ class ComplexTypeEntry : public TypeEntry
     bool isGenericClass() const { return m_generic_class; }
     void setGenericClass(bool isGeneric) { m_generic_class = isGeneric; }
 
+    bool hasNoCopy() const { return m_noCopy; }
+    void setNoCopy(bool noCopy) { m_noCopy = noCopy; }
+
 private:
     IncludeList m_extra_includes;
     Include m_include;
@@ -948,6 +952,7 @@ class ComplexTypeEntry : public TypeEntry
     uint m_generic_class : 1;
     uint m_createShell : 1;
     uint m_createPromoter : 1;
+    uint m_noCopy : 1;
 
     QString m_polymorphic_id_value;
     QString m_lookup_name;