diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:16:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-20 08:16:19 +0100 |
| commit | d80f3972a4efe996f3df6d27d689ea2646c1d9bb (patch) | |
| tree | ab121c7ca074bea4aee3acc5395f336799969727 /src/plugins/qmakeprojectmanager | |
| parent | 5de0e81d8bd2da30ce20f802c1e4922662f17473 (diff) | |
| parent | 7f0b418a2295996142488dfb24b3eef1285f7cd9 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: Ia8254720b2ba6e3e7b859017e1c2b6e289bed771
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index a09fdc6afd..a944edc8bd 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -384,6 +384,8 @@ QVariant QmakeProFileNode::data(Core::Id role) const if (role == Android::Constants::AndroidTargets) return {}; + if (role == Android::Constants::AndroidApk) + return {}; // We can not use AppMan headers even at build time. if (role == "AppmanPackageDir") |