1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some missing filename expandos to extra compilers

Browse Source 
- QMAKE_FILE_IN_EXT as an alias for QMAKE_FILE_EXT, for consistency with
  QMAKE_FILE_IN_BASE
- QMAKE_FILE_IN_NAME to make pairing _EXT/_BASE to get a full name
  unnecessary (finally ...), and make use of it
- QMAKE_FILE_OUT_PATH, because i'll need it

Change-Id: I3d91ddb84f9cce52a665d562da11d165c92550c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2016-04-29 11:34:14 +02:00
parent ce044ce348
commit 49f92f9ab7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/file_copies.prf
View File

@ -24,7 +24,7 @@ for (cp, COPIES) {
isEmpty(path): error("COPY $cp defines no .path") isEmpty(path): error("COPY $cp defines no .path")
base = $$eval($${cp}.base) base = $$eval($${cp}.base)
isEmpty(base) { isEmpty(base) {
$${pfx}.output = $$path/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} $${pfx}.output = $$path/${QMAKE_FILE_IN_NAME}
} else: isEqual(base, $$_PRO_FILE_PWD_) { } else: isEqual(base, $$_PRO_FILE_PWD_) {
$${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripProPwd} $${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripProPwd}
} else { } else {

10
qmake/generators/makefile.cpp
View File

@ -1619,7 +1619,7 @@ MakefileGenerator::replaceExtraCompilerVariables(
base = fi.fileName(); base = fi.fileName();
val += base; val += base;
} }
} else if(var == QLatin1String("QMAKE_FILE_EXT")) { } else if (var == QLatin1String("QMAKE_FILE_EXT") || var == QLatin1String("QMAKE_FILE_IN_EXT")) {
filePath = true; filePath = true;
for(int i = 0; i < in.size(); ++i) { for(int i = 0; i < in.size(); ++i) {
QFileInfo fi(fileInfo(Option::normalizePath(in.at(i)))); QFileInfo fi(fileInfo(Option::normalizePath(in.at(i))));
@ -1632,6 +1632,10 @@ MakefileGenerator::replaceExtraCompilerVariables(
ext = fi.fileName().remove(0, baseLen); ext = fi.fileName().remove(0, baseLen);
val += ext; val += ext;
} }
} else if (var == QLatin1String("QMAKE_FILE_IN_NAME")) {
filePath = true;
for (int i = 0; i < in.size(); ++i)
val += fileInfo(Option::normalizePath(in.at(i))).fileName();
} else if(var == QLatin1String("QMAKE_FILE_PATH") || var == QLatin1String("QMAKE_FILE_IN_PATH")) { } else if(var == QLatin1String("QMAKE_FILE_PATH") || var == QLatin1String("QMAKE_FILE_IN_PATH")) {
filePath = true; filePath = true;
for(int i = 0; i < in.size(); ++i) for(int i = 0; i < in.size(); ++i)
@ -1648,6 +1652,10 @@ MakefileGenerator::replaceExtraCompilerVariables(
filePath = true; filePath = true;
const ProKey funcname = var.mid(20).toKey(); const ProKey funcname = var.mid(20).toKey();
val += project->expand(funcname, QList<ProStringList>() << ProStringList(out)); val += project->expand(funcname, QList<ProStringList>() << ProStringList(out));
} else if (var == QLatin1String("QMAKE_FILE_OUT_PATH")) {
filePath = true;
for (int i = 0; i < out.size(); ++i)
val += fileInfo(Option::normalizePath(out.at(i))).path();
} else if(var == QLatin1String("QMAKE_FILE_OUT")) { } else if(var == QLatin1String("QMAKE_FILE_OUT")) {
filePath = true; filePath = true;
for(int i = 0; i < out.size(); ++i) for(int i = 0; i < out.size(); ++i)