diff options
-rw-r--r-- | qmake/generators/makefile.cpp | 8 | ||||
-rw-r--r-- | qmake/generators/makefile.h | 2 | ||||
-rw-r--r-- | qmake/generators/projectgenerator.cpp | 5 | ||||
-rw-r--r-- | qmake/generators/projectgenerator.h | 1 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake.h | 2 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 6 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.h | 1 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 6 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.h | 1 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 1 |
13 files changed, 7 insertions, 36 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index cb6da72cba..fb86dbe71e 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -131,7 +131,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const // ** base makefile generator MakefileGenerator::MakefileGenerator() : - init_opath_already(false), init_already(false), no_io(false), project(0) + no_io(false), project(0) { } @@ -167,10 +167,7 @@ MakefileGenerator::verifyCompilers() void MakefileGenerator::initOutPaths() { - if(init_opath_already) - return; verifyCompilers(); - init_opath_already = true; ProValueMap &v = project->variables(); //for shadow builds if(!v.contains("QMAKE_ABSOLUTE_SOURCE_PATH")) { @@ -413,10 +410,7 @@ void MakefileGenerator::init() { initOutPaths(); - if(init_already) - return; verifyCompilers(); - init_already = true; ProValueMap &v = project->variables(); diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 672ba87683..41a4b9103a 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -71,7 +71,7 @@ struct ReplaceExtraCompilerCacheKey; class MakefileGenerator : protected QMakeSourceFileInfo { QString spec; - bool init_opath_already, init_already, no_io; + bool no_io; QHash<QString, bool> init_compiler_already; QString makedir, chkexists; QString build_args(const QString &outdir=QString()); diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index cb00208a5b..d1b8e24437 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -55,17 +55,14 @@ QString project_builtin_regx() //calculate the builtin regular expression.. return ret; } -ProjectGenerator::ProjectGenerator() : MakefileGenerator(), init_flag(false) +ProjectGenerator::ProjectGenerator() : MakefileGenerator() { } void ProjectGenerator::init() { - if(init_flag) - return; int file_count = 0; - init_flag = true; verifyCompilers(); project->loadSpec(); diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h index e1fe4ffca6..7c5e919e19 100644 --- a/qmake/generators/projectgenerator.h +++ b/qmake/generators/projectgenerator.h @@ -40,7 +40,6 @@ QT_BEGIN_NAMESPACE class ProjectGenerator : public MakefileGenerator { - bool init_flag; bool addFile(QString); bool addConfig(const QString &, bool add=true); QString getWritableVar(const char *, bool fixPath=true); diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index e54ddf8ad7..8ca2b0a820 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -45,10 +45,6 @@ QT_BEGIN_NAMESPACE void UnixMakefileGenerator::init() { - if(init_flag) - return; - init_flag = true; - if(project->isEmpty("QMAKE_EXTENSION_SHLIB")) { if(project->isEmpty("QMAKE_CYGWIN_SHLIB")) { project->values("QMAKE_EXTENSION_SHLIB").append("so"); diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h index e90933649a..0eea0f296c 100644 --- a/qmake/generators/unix/unixmake.h +++ b/qmake/generators/unix/unixmake.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE class UnixMakefileGenerator : public MakefileGenerator { - bool init_flag, include_deps; + bool include_deps; QString libtoolFileName(bool fixify=true); void writeLibtoolFile(); // for libtool void writePrlFile(QTextStream &); diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 469f23340d..149a58459d 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -UnixMakefileGenerator::UnixMakefileGenerator() : MakefileGenerator(), init_flag(false), include_deps(false) +UnixMakefileGenerator::UnixMakefileGenerator() : MakefileGenerator(), include_deps(false) { } diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 247c53986e..85bc136e35 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), init_flag(false) +MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator() { if (isWindowsShell()) quote = "\""; @@ -218,10 +218,6 @@ void MingwMakefileGenerator::writeMingwParts(QTextStream &t) void MingwMakefileGenerator::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"); diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index bd26f343dc..cd47b28e2d 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -63,7 +63,6 @@ private: virtual bool findLibraries(); - bool init_flag; QString objectsLinkLine; QString quote; }; 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"); diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h index c514fa4452..2a17dc8691 100644 --- a/qmake/generators/win32/msvc_nmake.h +++ b/qmake/generators/win32/msvc_nmake.h @@ -40,7 +40,6 @@ QT_BEGIN_NAMESPACE class NmakeMakefileGenerator : public Win32MakefileGenerator { - bool init_flag; void writeNmakeParts(QTextStream &); bool writeMakefile(QTextStream &); void writeImplicitRulesPart(QTextStream &t); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index a30070a949..046701cd1e 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -208,7 +208,6 @@ const char _slnExtSections[] = "\n\tGlobalSection(ExtensibilityGlobals) = pos VcprojGenerator::VcprojGenerator() : Win32MakefileGenerator(), - init_flag(false), is64Bit(false), projectWriter(0) { @@ -767,9 +766,6 @@ bool VcprojGenerator::hasBuiltinCompiler(const QString &file) void VcprojGenerator::init() { - if (init_flag) - return; - init_flag = true; is64Bit = (project->first("QMAKE_TARGET.arch") == "x86_64"); projectWriter = createProjectWriter(); diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index f155fc2d5f..2870534835 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -49,7 +49,6 @@ class QUuid; struct VcsolutionDepend; class VcprojGenerator : public Win32MakefileGenerator { - bool init_flag; bool is64Bit; bool writeVcprojParts(QTextStream &); |