AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inline outputVariables()

Browse Source 
it's debugging code which is used only once (if even uncommented).

Change-Id: Ie57347017dd24f4acecff2a7132f82898dea3122
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-12 14:14:59 +01:00
parent 5932fc4ab8
commit 39882d88d0
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -796,6 +796,13 @@ void VcprojGenerator::init()
MakefileGenerator::init(); MakefileGenerator::init();
initOld(); // Currently calling old DSP code to set variables. CLEAN UP! 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 // Figure out what we're trying to build
if(project->first("TEMPLATE") == "vcapp") { if(project->first("TEMPLATE") == "vcapp") {
projectTarget = Application; projectTarget = Application;
@ -1637,9 +1644,6 @@ void VcprojGenerator::initOld()
project->values("MSVCPROJ_COPY_DLL").append(copydll); project->values("MSVCPROJ_COPY_DLL").append(copydll);
project->values("MSVCPROJ_COPY_DLL_DESC").append(deststr); 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()); 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 QT_END_NAMESPACE

1
qmake/generators/win32/msvc_vcproj.h
View File

@ -84,7 +84,6 @@ protected:
virtual bool mergeBuildProject(MakefileGenerator *other); virtual bool mergeBuildProject(MakefileGenerator *other);
virtual bool openOutput(QFile &file, const QString &build) const; virtual bool openOutput(QFile &file, const QString &build) const;
virtual void outputVariables();
void initOld(); void initOld();
virtual void initProject(); virtual void initProject();