aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/windows-msvc.qbs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-02-25 15:39:22 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2014-02-25 18:17:37 +0100
commiteac4bba41ed9e68dee9a019e0fedc51d220ef112 (patch)
tree97f728cccb9c52e94060d0d6ec4ae55d51b0cabe /share/qbs/modules/cpp/windows-msvc.qbs
parent11a04709f4282a399c75e7ef6cc6624733de4c71 (diff)
use filePath instead of fileName where applicable
This fixes the recently introduced deprecation warnings. Task-number: QBS-258 Change-Id: I10660270895ec89a1444d596922c22e9658ca3ab Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc.qbs')
-rw-r--r--share/qbs/modules/cpp/windows-msvc.qbs12
1 files changed, 6 insertions, 6 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 0137970d1..4e74ad034 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -217,16 +217,16 @@ CppModule {
prepare: {
var args = ['/nologo']
- var nativeOutputFileName = FileInfo.toWindowsSeparators(output.fileName)
+ var nativeOutputFileName = FileInfo.toWindowsSeparators(output.filePath)
args.push('/OUT:' + nativeOutputFileName)
for (var i in inputs.obj) {
- var fileName = FileInfo.toWindowsSeparators(inputs.obj[i].fileName)
+ var fileName = FileInfo.toWindowsSeparators(inputs.obj[i].filePath)
args.push(fileName)
}
var cmd = new Command("lib.exe", args);
- cmd.description = 'creating ' + FileInfo.fileName(output.fileName)
+ cmd.description = 'creating ' + FileInfo.fileName(output.filePath)
cmd.highlight = 'linker';
- cmd.workingDirectory = FileInfo.path(output.fileName)
+ cmd.workingDirectory = FileInfo.path(output.filePath)
cmd.responseFileUsagePrefix = '@';
return cmd;
}
@@ -269,9 +269,9 @@ CppModule {
args.push(systemIncludePaths[i]);
}
- args = args.concat(['/fo', output.fileName, input.fileName]);
+ args = args.concat(['/fo', output.filePath, input.filePath]);
var cmd = new Command('rc', args);
- cmd.description = 'compiling ' + FileInfo.fileName(input.fileName);
+ cmd.description = 'compiling ' + FileInfo.fileName(input.filePath);
cmd.highlight = 'compiler';
// Remove the first two lines of stdout. That's the logo.