equal
deleted
inserted
replaced
1517 QString base = fi.completeBaseName(); |
1517 QString base = fi.completeBaseName(); |
1518 if(base.isNull()) |
1518 if(base.isNull()) |
1519 base = fi.fileName(); |
1519 base = fi.fileName(); |
1520 val += base; |
1520 val += base; |
1521 } |
1521 } |
|
1522 } else if(var == QLatin1String("QMAKE_FILE_EXT")) { |
|
1523 filePath = true; |
|
1524 for(int i = 0; i < in.size(); ++i) { |
|
1525 QFileInfo fi(fileInfo(Option::fixPathToLocalOS(in.at(i)))); |
|
1526 QString ext; |
|
1527 // Ensure complementarity with QMAKE_FILE_BASE |
|
1528 int baseLen = fi.completeBaseName().length(); |
|
1529 if(baseLen == 0) |
|
1530 ext = fi.fileName(); |
|
1531 else |
|
1532 ext = fi.fileName().remove(0, baseLen); |
|
1533 val += ext; |
|
1534 } |
1522 } else if(var == QLatin1String("QMAKE_FILE_PATH") || var == QLatin1String("QMAKE_FILE_IN_PATH")) { |
1535 } else if(var == QLatin1String("QMAKE_FILE_PATH") || var == QLatin1String("QMAKE_FILE_IN_PATH")) { |
1523 filePath = true; |
1536 filePath = true; |
1524 for(int i = 0; i < in.size(); ++i) |
1537 for(int i = 0; i < in.size(); ++i) |
1525 val += fileInfo(Option::fixPathToLocalOS(in.at(i))).path(); |
1538 val += fileInfo(Option::fixPathToLocalOS(in.at(i))).path(); |
1526 } else if(var == QLatin1String("QMAKE_FILE_NAME") || var == QLatin1String("QMAKE_FILE_IN")) { |
1539 } else if(var == QLatin1String("QMAKE_FILE_NAME") || var == QLatin1String("QMAKE_FILE_IN")) { |