From 84c80538afc477cab4e76d7c30d0e50d27d75cf9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Nov 2014 19:04:42 +0100 Subject: remove pointless double initialization guards this isn't some fuzzy logic, the call sequence is well determined. Change-Id: I1696b49ed687da83d2969efcfe23ac6565630020 Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_nmake.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 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 e6170e4825..2c6ac9c2ab 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -56,7 +56,7 @@ static QString nmakePathList(const QStringList &list) .replace('#', QStringLiteral("^#")).replace('$', QStringLiteral("$$")); } -NmakeMakefileGenerator::NmakeMakefileGenerator() : Win32MakefileGenerator(), init_flag(false), usePCH(false) +NmakeMakefileGenerator::NmakeMakefileGenerator() : Win32MakefileGenerator(), usePCH(false) { } @@ -335,10 +335,6 @@ QString NmakeMakefileGenerator::var(const ProKey &value) const void NmakeMakefileGenerator::init() { - if(init_flag) - return; - init_flag = true; - /* this should probably not be here, but I'm using it to wrap the .t files */ if(project->first("TEMPLATE") == "app") project->values("QMAKE_APP_FLAG").append("1"); -- cgit v1.2.3