From 52f3a7d9d40d3bf835bb0716ad201ee56731b980 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 3 Apr 2020 11:49:27 +0200 Subject: Build qmake with QT_USE_STRINGBUILDER Should improve performance and is going to be required in the future anyway. Change-Id: I89d7c50441d2491da1ab0a4d564dcc91f52ade85 Reviewed-by: Alex Blasche --- qmake/generators/win32/msvc_nmake.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qmake/generators/win32/msvc_nmake.cpp') diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 2fb24201bd..73e84a3269 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -86,8 +86,8 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t) if (project->isActiveConfig("debug_info")) { if (t == "dlltarget" || project->values(ProKey(t + ".CONFIG")).indexOf("no_dll") == -1) { - const QFileInfo targetFileInfo = project->first("DESTDIR") + project->first("TARGET") - + project->first("TARGET_EXT"); + const QFileInfo targetFileInfo(project->first("DESTDIR") + project->first("TARGET") + + project->first("TARGET_EXT")); const QString pdb_target = targetFileInfo.completeBaseName() + ".pdb"; QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target; QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute)); @@ -245,8 +245,8 @@ void NmakeMakefileGenerator::init() project->values("PRECOMPILED_PCH_C") = ProStringList(precompPchC); } - const QFileInfo targetFileInfo = project->first("DESTDIR") + project->first("TARGET") - + project->first("TARGET_EXT"); + const QFileInfo targetFileInfo(project->first("DESTDIR") + project->first("TARGET") + + project->first("TARGET_EXT")); const ProString targetBase = targetFileInfo.path() + '/' + targetFileInfo.completeBaseName(); if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("shared")) { project->values("QMAKE_CLEAN").append(targetBase + ".exp"); -- cgit v1.2.3