diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 6c29cf53fd1..aeee344aeae 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -174,7 +174,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::tooltip() const diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index 392b632a8f8..a86bf217927 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -103,37 +103,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(node) && useQrcFile(node)) + if (dynamic_cast(node)) projectQrcFiles.append(node->filePath().toString()); }); // Check if the user has chosen to update the lacking resource inside designer @@ -145,7 +134,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 68e11a178de..f4c6c09a672 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, @@ -381,8 +379,7 @@ 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; } // TODO: Currently used only for "Build for current run config" functionality, but we should // probably use it to centralize the node-specific "Build" functionality that @@ -394,13 +391,13 @@ public: void setFallbackData(Core::Id key, const QVariant &value); protected: - void setProductType(ProductType type) { m_productType = type; } + void setIsProduct() { m_isProduct = true; } QString m_target; private: QHash m_fallbackData; // Used in data(), unless overridden. - 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 4a7f5fa5418..719897ec78a 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp @@ -328,14 +328,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 c2a15c9eaf9..a51c09f0ac2 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -257,14 +257,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 diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index e8bc1425a75..ef46aca7b26 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -235,6 +235,11 @@ def getOutputFromCmdline(cmdline, environment=None, acceptedError=0): return e.output def selectFromFileDialog(fileName, waitForFile=False, ignoreFinalSnooze=False): + def __closePopupIfNecessary__(): + if not isNull(QApplication.activePopupWidget()): + test.log("Closing active popup widget") + QApplication.activePopupWidget().close() + if platform.system() == "Darwin": snooze(1) nativeType("") @@ -252,12 +257,13 @@ def selectFromFileDialog(fileName, waitForFile=False, ignoreFinalSnooze=False): try: waitForObject("{name='QFileDialog' type='QFileDialog' visible='1'}", 5000) pathLine = waitForObject("{name='fileNameEdit' type='QLineEdit' visible='1'}") - snooze(1) replaceEditorContent(pathLine, pName) + snooze(1) clickButton(waitForObject("{text='Open' type='QPushButton'}")) waitFor("str(pathLine.text)==''") - snooze(1) replaceEditorContent(pathLine, fName) + snooze(1) + __closePopupIfNecessary__() clickButton(waitForObject("{text='Open' type='QPushButton'}")) except: nativeType("")