Commit 4facd1ea authored by Daniel Teske's avatar Daniel Teske
Browse files

Android: Prepend $$PWD to paths to ANDROID_EXTRA_LIBS



Task-number: QTCREATORBUG-11868

Change-Id: I3d3e559d7d5d58efb5b28bc29b71fa812cee277c
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
parent fc2fad44
...@@ -125,8 +125,8 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list) ...@@ -125,8 +125,8 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size()); beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
foreach (QString path, list) foreach (const QString &path, list)
m_entries += QDir(m_project->projectDirectory()).relativeFilePath(path); m_entries += QLatin1String("$$PWD/") + QDir(m_project->projectDirectory()).relativeFilePath(path);
QmakeProjectManager::QmakeProFileNode *node = m_project->rootQmakeProjectNode(); QmakeProjectManager::QmakeProFileNode *node = m_project->rootQmakeProjectNode();
node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries, m_scope, node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries, m_scope,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment