← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/android/androidextralibrarylistmodel.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-12-02 09:16:15 UTC
  • mfrom: (1.1.29)
  • Revision ID: timo.jyrinki@canonical.com-20131202091615-xbj1os1f604ber1m
New upstream release candidate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/android/androidextralibrarylistmodel.cpp
29
29
****************************************************************************/
30
30
 
31
31
#include "androidextralibrarylistmodel.h"
32
 
#include <qt4projectmanager/qmakeproject.h>
33
 
#include <qt4projectmanager/qmakenodes.h>
 
32
#include <qmakeprojectmanager/qmakeproject.h>
 
33
#include <qmakeprojectmanager/qmakenodes.h>
34
34
 
35
35
using namespace Android;
36
36
using namespace Internal;
37
37
 
38
 
AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(QmakeProjectManager::Qt4Project *project,
 
38
AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(QmakeProjectManager::QmakeProject *project,
39
39
                                                           QObject *parent)
40
40
    : QAbstractItemModel(parent)
41
41
    , m_project(project)
77
77
 
78
78
void AndroidExtraLibraryListModel::reset()
79
79
{
80
 
    if (m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
 
80
    if (m_project->rootQmakeProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
81
81
        return;
82
82
 
83
83
    beginResetModel();
84
 
    QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
 
84
    QmakeProjectManager::QmakeProFileNode *node = m_project->rootQmakeProjectNode();
85
85
    m_entries = node->variableValue(QmakeProjectManager::AndroidExtraLibs);
86
86
    endResetModel();
87
87
}
88
88
 
89
89
void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
90
90
{
91
 
    if (m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
 
91
    if (m_project->rootQmakeProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
92
92
        return;
93
93
 
94
94
    beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
96
96
    foreach (QString path, list)
97
97
        m_entries += QDir(m_project->projectDirectory()).relativeFilePath(path);
98
98
 
99
 
    QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
 
99
    QmakeProjectManager::QmakeProFileNode *node = m_project->rootQmakeProjectNode();
100
100
    node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" ")));
101
101
 
102
102
    endInsertRows();
109
109
 
110
110
void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
111
111
{
112
 
    if (list.isEmpty() || m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
 
112
    if (list.isEmpty() || m_project->rootQmakeProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
113
113
        return;
114
114
 
115
115
    std::sort(list.begin(), list.end(), greaterModelIndexByRow);
128
128
        endRemoveRows();
129
129
    }
130
130
 
131
 
    QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
 
131
    QmakeProjectManager::QmakeProFileNode *node = m_project->rootQmakeProjectNode();
132
132
    node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" ")));
133
133
}