diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-02 19:07:53 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-03 06:52:05 +0000 |
| commit | 4c9c2bb6f54ff3fff09679f895d7ef3452c709e7 (patch) | |
| tree | 58a53649312bd86797f925c684ef58a377c5fd37 | |
| parent | b46a5297a55c1547e3d9015e199e967276ad79c5 (diff) | |
| download | qttools-4c9c2bb6f54ff3fff09679f895d7ef3452c709e7.tar.gz | |
winrtrunner: Switch default target from phone to local deployment
Phone is no longer the main use case for winrt applications, so that
local deployment is a reasonable default. Changing the default to local
deployment means, that calling winrtrunner witout "--profile" or
"--device" will run the given executable locally. This new behavior
will help during the first phase of bringing winrt autotests into CI.
Change-Id: Id67e1ddd4e994c57402e60e5ba2db79f9a25653f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| -rw-r--r-- | src/winrtrunner/runner.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/winrtrunner/runner.cpp b/src/winrtrunner/runner.cpp index 761f834d5..203464001 100644 --- a/src/winrtrunner/runner.cpp +++ b/src/winrtrunner/runner.cpp @@ -93,34 +93,34 @@ Runner::Runner(const QString &app, const QStringList &arguments, bool deviceIndexKnown; d->deviceIndex = deviceName.toInt(&deviceIndexKnown); -#ifndef RTRUNNER_NO_APPXPHONE +#ifndef RTRUNNER_NO_APPXLOCAL if (!deviceIndexKnown) { - d->deviceIndex = AppxPhoneEngine::deviceNames().indexOf(deviceName); + d->deviceIndex = AppxLocalEngine::deviceNames().indexOf(deviceName); if (d->deviceIndex < 0) d->deviceIndex = 0; } - if ((d->profile.isEmpty() || d->profile.toLower() == QStringLiteral("appxphone")) - && AppxPhoneEngine::canHandle(this)) { - if (RunnerEngine *engine = AppxPhoneEngine::create(this)) { + if ((d->profile.isEmpty() || d->profile.toLower() == QStringLiteral("appx")) + && AppxLocalEngine::canHandle(this)) { + if (RunnerEngine *engine = AppxLocalEngine::create(this)) { d->engine.reset(engine); d->isValid = true; - qCWarning(lcWinRtRunner) << "Using the AppxPhone profile."; + qCWarning(lcWinRtRunner) << "Using the Appx profile."; return; } } #endif -#ifndef RTRUNNER_NO_APPXLOCAL +#ifndef RTRUNNER_NO_APPXPHONE if (!deviceIndexKnown) { - d->deviceIndex = AppxLocalEngine::deviceNames().indexOf(deviceName); + d->deviceIndex = AppxPhoneEngine::deviceNames().indexOf(deviceName); if (d->deviceIndex < 0) d->deviceIndex = 0; } - if ((d->profile.isEmpty() || d->profile.toLower() == QStringLiteral("appx")) - && AppxLocalEngine::canHandle(this)) { - if (RunnerEngine *engine = AppxLocalEngine::create(this)) { + if ((d->profile.isEmpty() || d->profile.toLower() == QStringLiteral("appxphone")) + && AppxPhoneEngine::canHandle(this)) { + if (RunnerEngine *engine = AppxPhoneEngine::create(this)) { d->engine.reset(engine); d->isValid = true; - qCWarning(lcWinRtRunner) << "Using the Appx profile."; + qCWarning(lcWinRtRunner) << "Using the AppxPhone profile."; return; } } |