feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix prebundled libraries use case

Browse Source 
Task-number: QTCREATORBUG-9319
Change-Id: Iadf4baee10d51c9cb83ef1fffd2bffd8dc3eae56
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-05-24 13:04:07 +02:00
parent b43027ac38
commit 8b61a5da2e
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanager.cpp
View File

@@ -757,7 +757,7 @@ QStringList AndroidManager::availablePrebundledLibs(ProjectExplorer::Target *tar
foreach (Qt4ProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles()) foreach (Qt4ProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles())
if (node->projectType() == Qt4ProjectManager::LibraryTemplate) if (node->projectType() == Qt4ProjectManager::LibraryTemplate)
libs << QLatin1String("lib") + node->targetInformation().target + QLatin1String(".so"); libs << node->targetInformation().target;
return libs; return libs;
} }

16
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -290,14 +290,6 @@ void AndroidPackageCreationStep::checkRequiredLibraries()
parseSharedLibs(readelfProc.readAll(), &libs); parseSharedLibs(readelfProc.readAll(), &libs);
AndroidManager::setQtLibs(target(), requiredLibraries(AndroidManager::availableQtLibsWithDependencies(target()), AndroidManager::setQtLibs(target(), requiredLibraries(AndroidManager::availableQtLibsWithDependencies(target()),
AndroidManager::qtLibs(target()), libs)); AndroidManager::qtLibs(target()), libs));
QStringList checkedLibs = AndroidManager::prebundledLibs(target());
QStringList prebundledLibraries;
foreach (const QString &qtLib, AndroidManager::availableQtLibs(target())) {
if (libs.contains(qtLib) || checkedLibs.contains(qtLib))
prebundledLibraries << qtLib;
}
AndroidManager::setPrebundledLibs(target(), prebundledLibraries);
emit updateRequiredLibrariesModels(); emit updateRequiredLibrariesModels();
} }
@@ -348,14 +340,6 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
QMetaObject::invokeMethod(this, "getBundleInformation"); QMetaObject::invokeMethod(this, "getBundleInformation");
QStringList prebundledLibraries;
foreach (const AndroidManager::Library &qtLib, m_availableQtLibs) {
if (libs.contains(qtLib.name) || m_prebundledLibs.contains(qtLib.name))
prebundledLibraries << qtLib.name;
}
QMetaObject::invokeMethod(this, "setPrebundledLibs", Qt::BlockingQueuedConnection,
Q_ARG(QStringList, prebundledLibraries));
emit updateRequiredLibrariesModels(); emit updateRequiredLibrariesModels();
} }