forked from qt-creator/qt-creator
Android: Debugger: Avoid warning regarding release build
This is just a workaround to avoid the warning of having a release build although building debug. In practice the validation should be done on the main library instead of the app_process of an Android executable. Change-Id: I4fe4ccc790d9e373a11f851c8216362188a97b85 Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
@@ -101,6 +101,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
|
|||||||
if (ToolChain *tc = ToolChainKitInformation::toolChain(kit))
|
if (ToolChain *tc = ToolChainKitInformation::toolChain(kit))
|
||||||
params.toolChainAbi = tc->targetAbi();
|
params.toolChainAbi = tc->targetAbi();
|
||||||
params.executable = target->activeBuildConfiguration()->buildDirectory().toString() + QLatin1String("/app_process");
|
params.executable = target->activeBuildConfiguration()->buildDirectory().toString() + QLatin1String("/app_process");
|
||||||
|
params.skipExecutableValidation = true;
|
||||||
params.remoteChannel = runConfig->remoteChannel();
|
params.remoteChannel = runConfig->remoteChannel();
|
||||||
params.solibSearchPath = AndroidManager::androidQtSupport(target)->soLibSearchPath(target);
|
params.solibSearchPath = AndroidManager::androidQtSupport(target)->soLibSearchPath(target);
|
||||||
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
|
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
|
||||||
|
|||||||
@@ -1793,6 +1793,8 @@ void DebuggerEngine::setStateDebugging(bool on)
|
|||||||
|
|
||||||
void DebuggerEngine::validateExecutable(DebuggerStartParameters *sp)
|
void DebuggerEngine::validateExecutable(DebuggerStartParameters *sp)
|
||||||
{
|
{
|
||||||
|
if (sp->skipExecutableValidation)
|
||||||
|
return;
|
||||||
if (sp->languages == QmlLanguage)
|
if (sp->languages == QmlLanguage)
|
||||||
return;
|
return;
|
||||||
QString binary = sp->executable;
|
QString binary = sp->executable;
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ public:
|
|||||||
startMode(NoStartMode),
|
startMode(NoStartMode),
|
||||||
closeMode(KillAtClose),
|
closeMode(KillAtClose),
|
||||||
useCtrlCStub(false),
|
useCtrlCStub(false),
|
||||||
|
skipExecutableValidation(false),
|
||||||
testCase(0)
|
testCase(0)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@@ -157,6 +158,9 @@ public:
|
|||||||
QString remoteExecutable;
|
QString remoteExecutable;
|
||||||
bool useCtrlCStub;
|
bool useCtrlCStub;
|
||||||
|
|
||||||
|
// Used by Android to avoid false positives on warnOnRelease
|
||||||
|
bool skipExecutableValidation;
|
||||||
|
|
||||||
// For Debugger testing.
|
// For Debugger testing.
|
||||||
int testCase;
|
int testCase;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user