diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-11 19:04:42 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:14:37 +0000 |
| commit | 84c80538afc477cab4e76d7c30d0e50d27d75cf9 (patch) | |
| tree | 18e49f9dae6ca16e9af469498f38260184343684 /qmake/generators/win32/msvc_nmake.cpp | |
| parent | 12b7b2c643e95681e2d6045de648e9031fb7fc11 (diff) | |
remove pointless double initialization guards
this isn't some fuzzy logic, the call sequence is well determined.
Change-Id: I1696b49ed687da83d2969efcfe23ac6565630020
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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"); |