diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-09-24 14:39:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-01 09:27:10 +0000 |
| commit | 736eef24ca9263339f4c576cba5d4b20fe188045 (patch) | |
| tree | eb40889871ded25164d05cc235663c4b64c45ab5 /src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | |
| parent | 85fcd10f90e3ccf8e8c5586fd84161145ef862a0 (diff) | |
| download | qt-creator-736eef24ca9263339f4c576cba5d4b20fe188045.tar.gz | |
Designer: Fix look-up of resources for UI files
Commit 81a643ec99, fixing QTCREATORBUG-22412, was too restrictive: UI
files in applications have access to resources of library dependencies,
so we must consider those. We now only exclude resources from other
applications.
Note that this will potentially list non-applicable resources, e.g.
those from libraries to which our product does not have access. This
cannot be reasonably prevented, because not all build systems provide
this information. It's also not as bad as missing resources.
Fixes: QTCREATORBUG-22909
Fixes: QTCREATORBUG-22962
Change-Id: I51a87402b43c156618982813c408060f300e4e58
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index f14f627b34..deb00e8f95 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); - setIsProduct(); + setProductType(ProductType::Other); } QString CMakeTargetNode::generateId(const Utils::FilePath &directory, const QString &target) |