From 8b61a5da2ed70a668b7e85466164bdc233028d11 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 24 May 2013 13:04:07 +0200 Subject: [PATCH] Android: Fix prebundled libraries use case Task-number: QTCREATORBUG-9319 Change-Id: Iadf4baee10d51c9cb83ef1fffd2bffd8dc3eae56 Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: BogDan Vatra --- src/plugins/android/androidmanager.cpp | 2 +- .../android/androidpackagecreationstep.cpp | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index a1d08290640..c712a0b06de 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -757,7 +757,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 25234204be1..9ca9af55f10 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -290,14 +290,6 @@ void AndroidPackageCreationStep::checkRequiredLibraries() parseSharedLibs(readelfProc.readAll(), &libs); AndroidManager::setQtLibs(target(), requiredLibraries(AndroidManager::availableQtLibsWithDependencies(target()), 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(); } @@ -348,14 +340,6 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun() 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(); }