diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-29 11:38:08 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-02 18:34:55 +0000 |
| commit | ce044ce3482b5abc85ecaf42842df1d4a5ad7806 (patch) | |
| tree | a3bece47188921a7b3fe38d47c2ec72cf056747c /qmake | |
| parent | be6a92ec0920491a68e747b48154ad8712d97f4b (diff) | |
ensure that QMAKE_FILE_{IN,OUT}_BASE are quoted
it's beyond me why they shouldn't be.
Change-Id: I2493469636e4f196bfeb2eb00a691aeae0f1881d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 5ec4cfb7ef..66d0b91d61 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1611,7 +1611,7 @@ MakefileGenerator::replaceExtraCompilerVariables( const ProKey funcname = var.mid(19).toKey(); val += project->expand(funcname, QList<ProStringList>() << ProStringList(in)); } else if(var == QLatin1String("QMAKE_FILE_BASE") || var == QLatin1String("QMAKE_FILE_IN_BASE")) { - //filePath = true; + filePath = true; for(int i = 0; i < in.size(); ++i) { QFileInfo fi(fileInfo(Option::normalizePath(in.at(i)))); QString base = fi.completeBaseName(); @@ -1653,7 +1653,7 @@ MakefileGenerator::replaceExtraCompilerVariables( for(int i = 0; i < out.size(); ++i) val += fileInfo(Option::normalizePath(out.at(i))).filePath(); } else if(var == QLatin1String("QMAKE_FILE_OUT_BASE")) { - //filePath = true; + filePath = true; for(int i = 0; i < out.size(); ++i) { QFileInfo fi(fileInfo(Option::normalizePath(out.at(i)))); QString base = fi.completeBaseName(); |