diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-04-01 11:39:07 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-01 10:48:26 +0200 |
| commit | b56451f036c5e823789f040874d1faa4b904dcc1 (patch) | |
| tree | f3ee875b304bbf573f20f03b0f10612a2f059e19 | |
| parent | f9d03fc1f5a775c1b57f138f4d2ba5b9cdaf2b97 (diff) | |
| download | qttools-b56451f036c5e823789f040874d1faa4b904dcc1.tar.gz | |
winrtrunner: Pass the relative executable as part of ImageParams
This is required in order for a proper argv[0] to be available when
ImageParams is used.
Change-Id: I3b3151303d5ff764113a000f1a02c94e7b4e5db9
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| -rw-r--r-- | src/winrtrunner/xapengine.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/winrtrunner/xapengine.cpp b/src/winrtrunner/xapengine.cpp index dfd4e9d37..c4149e165 100644 --- a/src/winrtrunner/xapengine.cpp +++ b/src/winrtrunner/xapengine.cpp @@ -94,6 +94,7 @@ public: QString genre; QString productId; QString executable; + QString relativeExecutable; QStringList icons; qint64 pid; DWORD exitCode; @@ -198,7 +199,8 @@ XapEngine::XapEngine(Runner *runner) qCWarning(lcWinRtRunner) << "Unable to determine executable in manifest: " << d->manifest; return; } - d->executable = QFileInfo(d->manifest).absoluteDir().absoluteFilePath(executablePattern.cap(1)); + d->relativeExecutable = executablePattern.cap(1); + d->executable = QFileInfo(d->manifest).absoluteDir().absoluteFilePath(d->relativeExecutable); // Icons QRegExp iconPattern(QStringLiteral("[\\\\/a-zA-Z0-9_\\-\\!]*\\.(png|jpg|jpeg)")); @@ -426,7 +428,8 @@ bool XapEngine::install(bool removeFirst) continue; if (QFileInfo(i.key()) == QFileInfo(d->manifest)) { - const QStringList args = d->runner->arguments() << QStringLiteral("-qdevel"); + const QStringList args = QStringList(d->relativeExecutable) + << d->runner->arguments() << QStringLiteral("-qdevel"); QByteArray manifestWithArgs = file.readAll(); manifestWithArgs.replace(QByteArrayLiteral("ImageParams=\"\""), QByteArrayLiteral("ImageParams=\"") |