diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-12 14:14:59 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:15:04 +0000 |
| commit | 39882d88d0b35ec4f90a2cc1054826c91e619f32 (patch) | |
| tree | 4cefec2940e19c65dab8a80afad4b89d9cacad04 /qmake/generators/win32 | |
| parent | 5932fc4ab8cbac6ba093fe5375dcba873b42b2e3 (diff) | |
inline outputVariables()
it's debugging code which is used only once (if even uncommented).
Change-Id: Ie57347017dd24f4acecff2a7132f82898dea3122
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 19 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 1 |
2 files changed, 7 insertions, 13 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 379b4189ce..865ff8ca4e 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -796,6 +796,13 @@ void VcprojGenerator::init() MakefileGenerator::init(); initOld(); // Currently calling old DSP code to set variables. CLEAN UP! +#if 0 + // Verbose output if "-d -d"... + qDebug("Generator: MSVC.NET: List of current variables:"); + for (ProValueMap::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) + qDebug("Generator: MSVC.NET: %s => %s", qPrintable(it.key().toQString()), qPrintable(it.value().join(" | "))); +#endif + // Figure out what we're trying to build if(project->first("TEMPLATE") == "vcapp") { projectTarget = Application; @@ -1637,9 +1644,6 @@ void VcprojGenerator::initOld() project->values("MSVCPROJ_COPY_DLL").append(copydll); project->values("MSVCPROJ_COPY_DLL_DESC").append(deststr); } - - // Verbose output if "-d -d"... - outputVariables(); } // ------------------------------------------------------------------------------------------------ @@ -1688,13 +1692,4 @@ bool VcprojGenerator::openOutput(QFile &file, const QString &/*build*/) const return Win32MakefileGenerator::openOutput(file, QString()); } -void VcprojGenerator::outputVariables() -{ -#if 0 - qDebug("Generator: MSVC.NET: List of current variables:"); - for (ProValueMap::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) - qDebug("Generator: MSVC.NET: %s => %s", qPrintable(it.key().toQString()), qPrintable(it.value().join(" | "))); -#endif -} - QT_END_NAMESPACE diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 4567a90635..03f8184f5d 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -84,7 +84,6 @@ protected: virtual bool mergeBuildProject(MakefileGenerator *other); virtual bool openOutput(QFile &file, const QString &build) const; - virtual void outputVariables(); void initOld(); virtual void initProject(); |