daily pastebin goal
55%
SHARE
TWEET

android

a guest May 15th, 2013 155 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
  2. index c701d7e..e925b33 100644
  3. --- a/src/plugins/android/androidmanager.cpp
  4. +++ b/src/plugins/android/androidmanager.cpp
  5. @@ -824,7 +824,7 @@ QStringList AndroidManager::availablePrebundledLibs(ProjectExplorer::Target *tar
  6.  
  7.      foreach (Qt4ProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles())
  8.          if (node->projectType() == Qt4ProjectManager::LibraryTemplate)
  9. -            libs << QLatin1String("lib") + node->targetInformation().target + QLatin1String(".so");
  10. +            libs << node->targetInformation().target;
  11.      return libs;
  12.  }
  13.  
  14. diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
  15. index df6d808..4967a7e 100644
  16. --- a/src/plugins/android/androidpackagecreationstep.cpp
  17. +++ b/src/plugins/android/androidpackagecreationstep.cpp
  18. @@ -295,6 +295,13 @@ void AndroidPackageCreationStep::checkRequiredLibraries()
  19.          if (libs.contains(qtLib) || checkedLibs.contains(qtLib))
  20.              prebundledLibraries << qtLib;
  21.      }
  22. +
  23. +    foreach (const QString &lib, libs) {
  24. +        const QString &name = lib.mid(3, lib.size() - 6);
  25. +        if (m_prebundledLibs.contains(name))
  26. +            prebundledLibraries << name;
  27. +    }
  28. +
  29.      AndroidManager::setPrebundledLibs(target(), prebundledLibraries);
  30.      emit updateRequiredLibrariesModels();
  31.  }
  32. @@ -337,6 +344,11 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
  33.          if (libs.contains(qtLib.name) || m_prebundledLibs.contains(qtLib.name))
  34.              prebundledLibraries << qtLib.name;
  35.      }
  36. +    foreach (const QString &lib, libs) {
  37. +        const QString &name = lib.mid(3, lib.size() - 6);
  38. +        if (m_prebundledLibs.contains(name))
  39. +            prebundledLibraries << name;
  40. +    }
  41.  
  42.      QMetaObject::invokeMethod(this, "setPrebundledLibs", Qt::BlockingQueuedConnection,
  43.                                Q_ARG(QStringList, prebundledLibraries));
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top