Fix bug 731 - "Can't specify more than a single 'since' argument"

1 files changed, 0 insertions, 24 deletions

diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp
index 29a21a051..f310aad4c 100644
--- a/abstractmetabuilder.cpp
+++ b/abstractmetabuilder.cpp
@@ -72,7 +72,6 @@ void AbstractMetaBuilder::checkFunctionModifications()
     TypeDatabase *types = TypeDatabase::instance();
     SingleTypeEntryHash entryHash = types->entries();
     QList<TypeEntry*> entries = entryHash.values();
-    double apiVersion = TypeDatabase::instance()->apiVersion();
 
     foreach (TypeEntry* entry, entries) {
         if (!entry)
@@ -84,8 +83,6 @@ void AbstractMetaBuilder::checkFunctionModifications()
         FunctionModificationList modifications = centry->functionModifications();
 
         foreach (FunctionModification modification, modifications) {
-            if (modification.version() > apiVersion)
-                continue;
             QString signature = modification.signature;
 
             QString name = signature.trimmed();
@@ -423,11 +420,6 @@ bool AbstractMetaBuilder::build(QIODevice* input)
         if (!funcEntry || !funcEntry->generateCode())
             continue;
 
-        if (!types->supportedApiVersion(funcEntry->version())) {
-            m_rejectedFunctions.insert(func->name(), ApiIncompatible);
-            continue;
-        }
-
         AbstractMetaFunction* metaFunc = traverseFunction(func);
         if (!metaFunc)
             continue;
@@ -486,11 +478,6 @@ bool AbstractMetaBuilder::build(QIODevice* input)
             if (entry->isPrimitive())
                 continue;
 
-            if (!types->supportedApiVersion(entry->version())) {
-                m_rejectedClasses.insert(entry->name(), ApiIncompatible);
-                continue;
-            }
-
             if ((entry->isValue() || entry->isObject())
                 && !entry->isString()
                 && !entry->isChar()
@@ -606,10 +593,6 @@ bool AbstractMetaBuilder::build(QIODevice* input)
 
     // Functions added to the module on the type system.
     foreach (AddedFunction addedFunc, types->globalUserFunctions()) {
-        if (!types->supportedApiVersion(addedFunc.version())) {
-            m_rejectedFunctions.insert(addedFunc.name(), ApiIncompatible);
-            continue;
-        }
         AbstractMetaFunction* metaFunc = traverseFunction(addedFunc);
         metaFunc->setFunctionType(AbstractMetaFunction::NormalFunction);
         m_globalFunctions << metaFunc;
@@ -967,13 +950,6 @@ AbstractMetaEnum* AbstractMetaBuilder::traverseEnum(EnumModelItem enumItem, Abst
         return 0;
     }
 
-    // Skipping api incompatible
-    if (!TypeDatabase::instance()->supportedApiVersion(typeEntry->version())) {
-        typeEntry->setCodeGeneration(TypeEntry::GenerateNothing);
-        m_rejectedEnums.insert(qualifiedName, ApiIncompatible);
-        return 0;
-    }
-
     AbstractMetaEnum* metaEnum = createMetaEnum();
     if (enumsDeclarations.contains(qualifiedName)
         || enumsDeclarations.contains(enumName)) {