diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-13 14:59:15 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-14 09:19:39 +0000 |
| commit | 63535355c257fb7d7283db0797068a5df451865b (patch) | |
| tree | aef307a20c49c932213b8c07605ae88862320921 /src | |
| parent | c29d8f0c34d1840f254c41b16bcc32ddb79525fa (diff) | |
Fix ProjectData::isExecutable()
When using bundles, the executable has the tag "bundle.application-
executable".
Task-number: QTCREATORBUG-19794
Change-Id: I5fd635e4105f1b290cf3d5e8f5a96523693e6128
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/api/projectdata_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/corelib/api/projectdata_p.h b/src/lib/corelib/api/projectdata_p.h index e81e04147..175848702 100644 --- a/src/lib/corelib/api/projectdata_p.h +++ b/src/lib/corelib/api/projectdata_p.h @@ -139,11 +139,10 @@ public: QString buildDir; }; -static inline bool isRunnableArtifact(const FileTags &fileTags, - bool isBundle) +inline bool isRunnableArtifact(const FileTags &fileTags, bool isBundle) { - return (fileTags.contains("application") - && (!isBundle || fileTags.contains("bundle.content"))) + return (fileTags.contains("application") && (!isBundle || fileTags.contains("bundle.content"))) + || fileTags.contains("bundle.application-executable") || fileTags.contains("android.apk") || fileTags.contains("msi"); } |