forked from qt-creator/qt-creator
Android: Fix use_local_libs when running from launcher
The old way of passing the use_local_libs settings to the app (which is still supported for compatibility with Necessitas) was to pass it as command line arguments when the app is launched from Qt Creator. This will make the app depend on Ministro if it's later launched from the Android launcher. To avoid this, we pass the info as part of AndroidManifest.xml instead. Task-number: QTCREATORBUG-8643 Change-Id: Ib044ce8bf7e285cf46075a8713bd7fc6736052d5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -208,6 +208,11 @@ void AndroidDeployStep::setDeployQASIPackagePath(const QString &package)
|
||||
void AndroidDeployStep::setUseLocalQtLibs(bool useLocal)
|
||||
{
|
||||
m_useLocalQtLibs = useLocal;
|
||||
|
||||
// ### Passes -1 for API level, which means it won't work with setups that require
|
||||
// library selection based on API level. Use the old approach (command line argument)
|
||||
// in these cases.
|
||||
AndroidManager::setUseLocalLibs(target(), useLocal, -1);
|
||||
}
|
||||
|
||||
bool AndroidDeployStep::runCommand(QProcess *buildProc,
|
||||
|
||||
Reference in New Issue
Block a user