remove support for the deprecated ProductModule item

Change-Id: I8bf2b381d17e4bcee5a6111ea77d95b4b1201fa5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

3 files changed, 0 insertions, 12 deletions

diff --git a/src/lib/language/builtindeclarations.cpp b/src/lib/language/builtindeclarations.cpp
index 3af3f7fd2..381d87ac7 100644
--- a/src/lib/language/builtindeclarations.cpp
+++ b/src/lib/language/builtindeclarations.cpp
@@ -192,7 +192,6 @@ void BuiltinDeclarations::addDependsItem()
 void BuiltinDeclarations::addExportItem()
 {
     QList<PropertyDeclaration> properties;
-    m_builtins[QLatin1String("ProductModule")] = properties; // ### remove in 1.2
     m_builtins[QLatin1String("Export")] = properties;
 }
 
diff --git a/src/lib/language/moduleloader.cpp b/src/lib/language/moduleloader.cpp
index 9c97271b6..8e6c10bc9 100644
--- a/src/lib/language/moduleloader.cpp
+++ b/src/lib/language/moduleloader.cpp
@@ -293,8 +293,6 @@ void ModuleLoader::handleProduct(ProjectContext *projectContext, Item *item)
             handleArtifact(&productContext, child);
         else if (child->typeName() == QLatin1String("Export"))
             deferExportItem(&productContext, child);
-        else if (child->typeName() == QLatin1String("ProductModule"))   // ### remove in 1.2
-            handleProductModule(&productContext, child);
         else if (child->typeName() == QLatin1String("Probe"))
             resolveProbe(item, child);
     }
@@ -396,14 +394,6 @@ void ModuleLoader::deferExportItem(ModuleLoader::ProductContext *productContext,
     productContext->exportItems.append(item);
 }
 
-void ModuleLoader::handleProductModule(ModuleLoader::ProductContext *productContext,
-                                       Item *item)
-{
-    m_logger.printWarning(ErrorInfo(Tr::tr("ProductModule {} is deprecated. "
-                                     "Please use Export {} instead."), item->location()));
-    deferExportItem(productContext, item);
-}
-
 static void mergeProperty(Item *dst, const QString &name, const ValuePtr &value)
 {
     if (value->type() == Value::ItemValueType) {
diff --git a/src/lib/language/moduleloader.h b/src/lib/language/moduleloader.h
index 30c3863e2..94c4a1500 100644
--- a/src/lib/language/moduleloader.h
+++ b/src/lib/language/moduleloader.h
@@ -155,7 +155,6 @@ private:
     void handleGroup(ProductContext *productContext, Item *group);
     void handleArtifact(ProductContext *productContext, Item *item);
     void deferExportItem(ProductContext *productContext, Item *item);
-    void handleProductModule(ProductContext *productContext, Item *item);   // ### remove in 1.2
     void mergeExportItems(ProductContext *productContext);
     void propagateModulesFromProduct(ProductContext *productContext, Item *item);
     void resolveDependencies(DependsContext *productContext, Item *item);