diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-08-16 15:35:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-08-16 20:37:19 +0000 |
| commit | 1de9d68b2631de9432ab9929bb4b917604cc7be7 (patch) | |
| tree | 93114ef8960eee0e11f7eaf2feb7d75d47139fb9 | |
| parent | f922dc165c61faeba39441595cb67dcf088ee8c8 (diff) | |
idc: Fix quoting of .idl file
Call quotePath() on the idlfile inside dumpIdl() when building
the command to run for .exe files instead of quoting it before
passing it to dumpIdl().
Task-number: QTBUG-55332
Change-Id: Iae934e960d94fe1f9b469ca57f9fba2c74ee108c
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | src/tools/idc/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp index 50610ac..76c25e5 100644 --- a/src/tools/idc/main.cpp +++ b/src/tools/idc/main.cpp @@ -243,7 +243,9 @@ static HRESULT dumpIdl(const QString &input, const QString &idlfile, const QStri HRESULT res = E_FAIL; if (hasExeExtension(input)) { - if (runWithQtInEnvironment(quotePath(input) + QLatin1String(" -dumpidl ") + idlfile + QLatin1String(" -version ") + version)) + const QString command = quotePath(input) + QLatin1String(" -dumpidl ") + + quotePath(idlfile) + QLatin1String(" -version ") + version; + if (runWithQtInEnvironment(command)) res = S_OK; } else { HMODULE hdll = loadLibraryQt(input); @@ -386,7 +388,7 @@ int runIdc(int argc, char **argv) fprintf(stderr, "%s\n", qPrintable(error)); return ok ? 0 : 4; } else if (!idlfile.isEmpty()) { - idlfile = quotePath(QDir::toNativeSeparators(idlfile)); + idlfile = QDir::toNativeSeparators(idlfile); fprintf(stderr, "\n\n%s\n\n", qPrintable(idlfile)); const HRESULT res = dumpIdl(input, idlfile, version); |