Android: Adding libraries to subdirs projects

Task-number: QTCREATORBUG-11625

Change-Id: I1017546463e819fc05846af74582cb9f5739ff08
Reviewed-by: BogDan Vatra <bogdan@kde.org>

1 files changed, 11 insertions, 8 deletions

diff --git a/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h
index f810a36387..7b8c932195 100644
--- a/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h
+++ b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h
@@ -35,11 +35,13 @@
 #include <QAbstractItemModel>
 #include <QStringList>
 
-namespace QmakeProjectManager {
-class QmakeProject;
-class QmakeProFileNode;
+namespace ProjectExplorer {
+class RunConfiguration;
+class Target;
 }
 
+namespace QmakeProjectManager { class QmakeProFileNode; }
+
 namespace QmakeAndroidSupport {
 
 namespace Internal {
@@ -47,7 +49,7 @@ class AndroidExtraLibraryListModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
-    explicit AndroidExtraLibraryListModel(QmakeProjectManager::QmakeProject *project,
+    explicit AndroidExtraLibraryListModel(ProjectExplorer::Target *target,
                                           QObject *parent = 0);
 
     QModelIndex index(int row, int column, const QModelIndex &parent) const;
@@ -64,11 +66,12 @@ public:
 signals:
     void enabledChanged(bool);
 
-private slots:
-    void proFileUpdated(QmakeProjectManager::QmakeProFileNode *node, bool success, bool parseInProgress);
-
 private:
-    QmakeProjectManager::QmakeProject *m_project;
+    void proFileUpdated(QmakeProjectManager::QmakeProFileNode *node);
+    void activeRunConfigurationChanged();
+    QmakeProjectManager::QmakeProFileNode *activeNode() const;
+
+    ProjectExplorer::Target *m_target;
     QStringList m_entries;
     QString m_scope;
 };