diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-07-24 15:27:19 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-07-25 09:43:54 +0000 |
| commit | 3881ff94f7c6386fe43c8e8cc2e47e317a382641 (patch) | |
| tree | 115499b64e2c2e2a9d16e6a4504bd1ea1fa19e1c /src/plugins/qmakeandroidsupport | |
| parent | 7d8847101d4b91c11dc89826b0058257bd1fc95d (diff) | |
| download | qt-creator-3881ff94f7c6386fe43c8e8cc2e47e317a382641.tar.gz | |
Android: Fix sdkmanager timing out on slower machines
sdkmanager times out on slower machines or with slower network
connection. Increase the timeout and show timeout message box
Task-number: QTCREATORBUG-18458
Change-Id: I9118024ec1438ef9c18842df2f7431e696c73f92
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmakeandroidsupport')
| -rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index ce087ff9df..4ca9ef9653 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -158,6 +158,13 @@ bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) return true; } + QString buildTargetSdk = AndroidManager::buildTargetSDK(target()); + if (buildTargetSdk.isEmpty()) { + emit addOutput(tr("Android build SDK not defined. Check Android settings."), + OutputFormat::Stderr); + return false; + } + QStringList arguments; arguments << QLatin1String("--input") << inputFile |