Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
- index c701d7e..e925b33 100644
- --- a/src/plugins/android/androidmanager.cpp
- +++ b/src/plugins/android/androidmanager.cpp
- @@ -824,7 +824,7 @@ QStringList AndroidManager::availablePrebundledLibs(ProjectExplorer::Target *tar
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles())
- if (node->projectType() == Qt4ProjectManager::LibraryTemplate)
- - libs << QLatin1String("lib") + node->targetInformation().target + QLatin1String(".so");
- + libs << node->targetInformation().target;
- return libs;
- }
- diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
- index df6d808..4967a7e 100644
- --- a/src/plugins/android/androidpackagecreationstep.cpp
- +++ b/src/plugins/android/androidpackagecreationstep.cpp
- @@ -295,6 +295,13 @@ void AndroidPackageCreationStep::checkRequiredLibraries()
- if (libs.contains(qtLib) || checkedLibs.contains(qtLib))
- prebundledLibraries << qtLib;
- }
- +
- + foreach (const QString &lib, libs) {
- + const QString &name = lib.mid(3, lib.size() - 6);
- + if (m_prebundledLibs.contains(name))
- + prebundledLibraries << name;
- + }
- +
- AndroidManager::setPrebundledLibs(target(), prebundledLibraries);
- emit updateRequiredLibrariesModels();
- }
- @@ -337,6 +344,11 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
- if (libs.contains(qtLib.name) || m_prebundledLibs.contains(qtLib.name))
- prebundledLibraries << qtLib.name;
- }
- + foreach (const QString &lib, libs) {
- + const QString &name = lib.mid(3, lib.size() - 6);
- + if (m_prebundledLibs.contains(name))
- + prebundledLibraries << name;
- + }
- QMetaObject::invokeMethod(this, "setPrebundledLibs", Qt::BlockingQueuedConnection,
- Q_ARG(QStringList, prebundledLibraries));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement