Revert "Designer: Fix look-up of resources for UI files"

This reverts commit 736eef24ca9263339f4c576cba5d4b20fe188045,
which breaks binary compatibility.

Change-Id: I696ad3e6efc6f02f595356c9864d69629eeef8bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

5 files changed, 17 insertions, 45 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index deb00e8f95..f14f627b34 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -173,7 +173,7 @@ CMakeTargetNode::CMakeTargetNode(const Utils::FilePath &directory, const QString
     setPriority(Node::DefaultProjectPriority + 900);
     setIcon(QIcon(":/projectexplorer/images/build.png")); // TODO: Use proper icon!
     setListInProject(false);
-    setProductType(ProductType::Other);
+    setIsProduct();
 }
 
 QString CMakeTargetNode::generateId(const Utils::FilePath &directory, const QString &target)
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp
index c01dbc95f6..84020f77ee 100644
--- a/src/plugins/designer/resourcehandler.cpp
+++ b/src/plugins/designer/resourcehandler.cpp
@@ -99,37 +99,26 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources)
 
         // Find the (sub-)project the file belongs to. We don't want to find resources
         // from other parts of the project tree, e.g. via a qmake subdirs project.
-        Node * const fileNode = project->rootProjectNode()->findNode([&fileName](const Node *n) {
+        ProjectNode *projectNode = project->rootProjectNode();
+        Node * const fileNode = projectNode->findNode([&fileName](const Node *n) {
             return n->filePath().toString() == fileName;
         });
-        ProjectNode *projectNodeForUiFile = nullptr;
         if (fileNode) {
             // We do not want qbs groups or qmake .pri files here, as they contain only a subset
             // of the relevant files.
-            projectNodeForUiFile = fileNode->parentProjectNode();
-            while (projectNodeForUiFile && !projectNodeForUiFile->isProduct())
-                projectNodeForUiFile = projectNodeForUiFile->parentProjectNode();
+            projectNode = fileNode->parentProjectNode();
+            while (projectNode && !projectNode->isProduct())
+                projectNode = projectNode->parentProjectNode();
         }
-        if (!projectNodeForUiFile)
-            projectNodeForUiFile = project->rootProjectNode();
-
-        const auto useQrcFile = [projectNodeForUiFile, project](const Node *qrcNode) {
-            if (projectNodeForUiFile == project->rootProjectNode())
-                return true;
-            ProjectNode *projectNodeForQrcFile = qrcNode->parentProjectNode();
-            while (projectNodeForQrcFile && !projectNodeForQrcFile->isProduct())
-                projectNodeForQrcFile = projectNodeForQrcFile->parentProjectNode();
-            return !projectNodeForQrcFile
-                    || projectNodeForQrcFile == projectNodeForUiFile
-                    || projectNodeForQrcFile->productType() != ProductType::App;
-        };
+        if (!projectNode)
+            projectNode = project->rootProjectNode();
 
         QStringList projectQrcFiles;
-        project->rootProjectNode()->forEachNode([&](FileNode *node) {
-            if (node->fileType() == FileType::Resource && useQrcFile(node))
+        projectNode->forEachNode([&](FileNode *node) {
+            if (node->fileType() == FileType::Resource)
                 projectQrcFiles.append(node->filePath().toString());
         }, [&](FolderNode *node) {
-            if (dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node) && useQrcFile(node))
+            if (dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node))
                 projectQrcFiles.append(node->filePath().toString());
         });
         // Check if the user has chosen to update the lacking resource inside designer
@@ -141,7 +130,7 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources)
             }
             if (!qrcPathsToBeAdded.isEmpty()) {
                 m_handlingResources = true;
-                projectNodeForUiFile->addFiles(qrcPathsToBeAdded);
+                projectNode->addFiles(qrcPathsToBeAdded);
                 m_handlingResources = false;
                 projectQrcFiles += qrcPathsToBeAdded;
             }
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index a214407515..ce36882aa9 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -57,8 +57,6 @@ enum class FileType : quint16 {
     FileTypeSize
 };
 
-enum class ProductType { App, Lib, Other, None };
-
 enum ProjectAction {
     // Special value to indicate that the actions are handled by the parent
     InheritedFromParent,
@@ -359,16 +357,15 @@ public:
     virtual QVariant data(Core::Id role) const;
     virtual bool setData(Core::Id role, const QVariant &value) const;
 
-    bool isProduct() const { return m_productType != ProductType::None; }
-    ProductType productType() const { return m_productType; }
+    bool isProduct() const { return m_isProduct; }
 
 protected:
-    void setProductType(ProductType type) { m_productType = type; }
+    void setIsProduct() { m_isProduct = true; }
 
     QString m_target;
 
 private:
-    ProductType m_productType = ProductType::None;
+    bool m_isProduct = false;
 };
 
 class PROJECTEXPLORER_EXPORT ContainerNode : public FolderNode
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index 4f7f2e5f08..62762069b2 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -320,14 +320,7 @@ QbsProductNode::QbsProductNode(const qbs::ProductData &prd) :
 {
     static QIcon productIcon = Core::FileIconProvider::directoryIcon(Constants::QBS_PRODUCT_OVERLAY_ICON);
     setIcon(productIcon);
-    if (m_qbsProductData.isRunnable()) {
-        setProductType(ProductType::App);
-    } else if (m_qbsProductData.type().contains("dynamiclibrary")
-               || m_qbsProductData.type().contains("staticlibrary")) {
-        setProductType(ProductType::Lib);
-    } else {
-        setProductType(ProductType::Other);
-    }
+    setIsProduct();
 }
 
 bool QbsProductNode::supportsAction(ProjectAction action, const Node *node) const
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 24b6b8cb03..a71ab8c3d6 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -230,14 +230,7 @@ FolderNode::AddNewInformation QmakePriFileNode::addNewInformation(const QStringL
 QmakeProFileNode::QmakeProFileNode(QmakeProject *project, const FilePath &filePath, QmakeProFile *pf) :
     QmakePriFileNode(project, this, filePath, pf)
 {
-    if (projectType() == ProjectType::ApplicationTemplate) {
-        setProductType(ProductType::App);
-    } else if (projectType() == ProjectType::SharedLibraryTemplate
-               || projectType() == ProjectType::StaticLibraryTemplate) {
-        setProductType(ProductType::Lib);
-    } else if (projectType() != ProjectType::SubDirsTemplate) {
-        setProductType(ProductType::Other);
-    }
+    setIsProduct();
 }
 
 bool QmakeProFileNode::showInSimpleTree() const