Remove the deprecated Product.profile property

It was not used anywhere anymore.

Change-Id: I420c40f562634159e838a805aeedbefb89185c75
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

9 files changed, 25 insertions, 20 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 61ce373ff..bc9f05e81 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -206,7 +206,6 @@ QList<ResolvedProductPtr> ProjectPrivate::allEnabledInternalProducts(bool includ
 static bool matches(const ProductData &product, const ResolvedProductConstPtr &rproduct)
 {
     return product.name() == rproduct->name
-            && product.profile() == rproduct->profile
             && product.multiplexConfigurationId() == rproduct->multiplexConfigurationId;
 }
 
@@ -786,7 +785,6 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
         product.d->targetName = resolvedProduct->targetName;
         product.d->version = resolvedProduct
                 ->productProperties.value(StringConstants::versionProperty()).toString();
-        product.d->profile = resolvedProduct->profile;
         product.d->multiplexConfigurationId = resolvedProduct->multiplexConfigurationId;
         product.d->location = resolvedProduct->location;
         product.d->buildDirectory = resolvedProduct->buildDirectory();
@@ -1156,7 +1154,7 @@ Project::BuildGraphInfo Project::getBuildGraphInfo(const QString &bgFilePath,
         for (const ResolvedProductConstPtr &product : project->allProducts()) {
             if (props.empty())
                 break;
-            if (product->profile != project->profile())
+            if (product->profile() != project->profile())
                 continue;
             for (auto it = props.begin(); it != props.end();) {
                 const QVariant value
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 3fd5f5ec3..e449f9fab 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -46,6 +46,7 @@
 #include <tools/jsliterals.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
 
@@ -484,7 +485,9 @@ QString ProductData::version() const
  */
 QString ProductData::profile() const
 {
-    return d->profile;
+    return d->moduleProperties.getModuleProperty(
+                Internal::StringConstants::qbsModule(),
+                Internal::StringConstants::profileProperty()).toString();
 }
 
 QString ProductData::multiplexConfigurationId() const
diff --git a/src/lib/corelib/api/projectdata_p.h b/src/lib/corelib/api/projectdata_p.h
index 175848702..69b046b0c 100644
--- a/src/lib/corelib/api/projectdata_p.h
+++ b/src/lib/corelib/api/projectdata_p.h
@@ -110,7 +110,6 @@ public:
     QString name;
     QString targetName;
     QString version;
-    QString profile;
     QString multiplexConfigurationId;
     CodeLocation location;
     QString buildDirectory;
diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp
index 09828bbcf..8aac3c24a 100644
--- a/src/lib/corelib/language/builtindeclarations.cpp
+++ b/src/lib/corelib/language/builtindeclarations.cpp
@@ -376,8 +376,6 @@ void BuiltinDeclarations::addProductItem()
     profilesDecl.setDeprecationInfo(DeprecationInfo(Version::fromString(QLatin1String("1.9.0")),
                                                     Tr::tr("Use qbs.profiles instead.")));
     item << profilesDecl;
-    item << PropertyDeclaration(StringConstants::profileProperty(), PropertyDeclaration::String,
-                                QLatin1String("project.profile")); // Internal
     item << PropertyDeclaration(StringConstants::targetNameProperty(), PropertyDeclaration::String,
                                 QLatin1String("new String(name)"
                                               ".replace(/[/\\\\?%*:|\"<>]/g, '_').valueOf()"));
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index 87b774d98..3463303e3 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -481,6 +481,11 @@ QString ResolvedProduct::fullDisplayName() const
     return fullDisplayName(name, multiplexConfigurationId);
 }
 
+QString ResolvedProduct::profile() const
+{
+    return moduleProperties->qbsPropertyValue(StringConstants::profileProperty()).toString();
+}
+
 static QStringList findGeneratedFiles(const Artifact *base, bool recursive, const FileTags &tags)
 {
     QStringList result;
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index c486fd901..1e7af6fea 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -562,7 +562,6 @@ public:
     FileTags fileTags;
     QString name;
     QString targetName;
-    QString profile;
     QString multiplexConfigurationId;
     QString sourceDirectory;
     QString destinationDirectory;
@@ -608,6 +607,7 @@ public:
     QString uniqueName() const;
     static QString fullDisplayName(const QString &name, const QString &multiplexConfigurationId);
     QString fullDisplayName() const;
+    QString profile() const;
 
     QStringList generatedFiles(const QString &baseFile, bool recursive, const FileTags &tags) const;
 
@@ -629,7 +629,7 @@ private:
 
     template<PersistentPool::OpType opType> void serializationOp(PersistentPool &pool)
     {
-        pool.serializationOp<opType>(enabled, fileTags, name, profile, multiplexConfigurationId,
+        pool.serializationOp<opType>(enabled, fileTags, name, multiplexConfigurationId,
                                      targetName, sourceDirectory, destinationDirectory,
                                      missingSourceFiles, location, productProperties,
                                      moduleProperties, rules, dependencies, dependencyParameters,
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 1a0843edc..0c2a246d6 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -852,10 +852,6 @@ QList<Item *> ModuleLoader::multiplexProductItem(ProductContext *dummyContext, I
             const QString &propertyName = multiplexInfo.properties.at(column);
             const VariantValuePtr &mpvalue = mprow.at(column);
             qbsItem->setProperty(propertyName, mpvalue);
-
-            // Backward compatibility
-            if (propertyName == StringConstants::profileProperty())
-                item->setProperty(StringConstants::profileProperty(), mpvalue);
         }
     }
 
@@ -967,8 +963,16 @@ void ModuleLoader::prepareProduct(ProjectContext *projectContext, Item *productI
     productContext.project = projectContext;
     productContext.name = m_evaluator->stringValue(productItem, StringConstants::nameProperty());
     QBS_CHECK(!productContext.name.isEmpty());
-    productContext.profileName = m_evaluator->stringValue(
-                productItem, StringConstants::profileProperty(), QString());
+    const ItemValueConstPtr qbsItemValue = productItem->itemProperty(StringConstants::qbsModule());
+    if (!!qbsItemValue && qbsItemValue->item()->hasProperty(StringConstants::profileProperty())) {
+        qbsItemValue->item()->setProperty(StringConstants::nameProperty(),
+                                          VariantValue::create(StringConstants::nameProperty()));
+        productContext.profileName = m_evaluator->stringValue(
+                    qbsItemValue->item(),
+                    StringConstants::profileProperty(), QString());
+    } else {
+        productContext.profileName = m_parameters.topLevelProfile();
+    }
     productContext.multiplexConfigurationId = m_evaluator->stringValue(
                 productItem, StringConstants::multiplexConfigurationIdProperty());
     productContext.multiplexConfigIdForModulePrototypes = m_evaluator->stringValue(
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 995d6ab1c..c9fe3f063 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -435,8 +435,6 @@ void ProjectResolver::resolveProductFully(Item *item, ProjectContext *projectCon
     // product->buildDirectory() isn't valid yet, because the productProperties map is not ready.
     m_productContext->buildDirectory
             = m_evaluator->stringValue(item, StringConstants::buildDirectoryProperty());
-    product->profile = m_evaluator->stringValue(item, StringConstants::profileProperty());
-    QBS_CHECK(!product->profile.isEmpty());
     product->multiplexConfigurationId
             = m_evaluator->stringValue(item, StringConstants::multiplexConfigurationIdProperty());
     qCDebug(lcProjectResolver) << "resolveProduct" << product->uniqueName();
@@ -1353,10 +1351,10 @@ ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies(
                                 .arg(product->fullDisplayName(), depDisplayName),
                                 product->location);
             }
-            if (!dependency.profile.isEmpty() && usedProduct->profile != dependency.profile) {
+            if (!dependency.profile.isEmpty() && usedProduct->profile() != dependency.profile) {
                 usedProduct.reset();
                 for (const ResolvedProductPtr &p : qAsConst(m_productsByName)) {
-                    if (p->name == dependency.name && p->profile == dependency.profile) {
+                    if (p->name == dependency.name && p->profile() == dependency.profile) {
                         usedProduct = p;
                         break;
                     }
diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp
index bf2ce6f95..6d8aadf7e 100644
--- a/src/lib/corelib/tools/persistence.cpp
+++ b/src/lib/corelib/tools/persistence.cpp
@@ -49,7 +49,7 @@
 namespace qbs {
 namespace Internal {
 
-static const char QBS_PERSISTENCE_MAGIC[] = "QBSPERSISTENCE-115";
+static const char QBS_PERSISTENCE_MAGIC[] = "QBSPERSISTENCE-116";
 
 NoBuildGraphError::NoBuildGraphError(const QString &filePath)
     : ErrorInfo(Tr::tr("Build graph not found for configuration '%1'. Expected location was '%2'.")