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

inline NmakeMakefileGenerator::getPdbTarget()

Browse Source 
it was used only once, and virtual for no reason whatsoever.

Change-Id: I99411be3dac93d8a129441f656b2443d09108564
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-09-22 20:58:18 +02:00
parent 6c4d7667e4
commit 9db1644165
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/generators/win32/msvc_nmake.cpp
View File

@ -266,11 +266,6 @@ void NmakeMakefileGenerator::writeSubMakeCall(QTextStream &t, const QString &cal
Win32MakefileGenerator::writeSubMakeCall(t, callPrefix, makeArguments); Win32MakefileGenerator::writeSubMakeCall(t, callPrefix, makeArguments);
} }
QString NmakeMakefileGenerator::getPdbTarget()
{
return QString(project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".pdb");
}
QString NmakeMakefileGenerator::defaultInstall(const QString &t) QString NmakeMakefileGenerator::defaultInstall(const QString &t)
{ {
if((t != "target" && t != "dlltarget") || if((t != "target" && t != "dlltarget") ||
@ -288,7 +283,7 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t)
if (project->isActiveConfig("debug_info")) { if (project->isActiveConfig("debug_info")) {
if (t == "dlltarget" || project->values(ProKey(t + ".CONFIG")).indexOf("no_dll") == -1) { if (t == "dlltarget" || project->values(ProKey(t + ".CONFIG")).indexOf("no_dll") == -1) {
QString pdb_target = getPdbTarget(); QString pdb_target = project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".pdb";
QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target; QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute)); QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
if(!ret.isEmpty()) if(!ret.isEmpty())

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

@ -52,7 +52,6 @@ class NmakeMakefileGenerator : public Win32MakefileGenerator
protected: protected:
virtual void writeSubMakeCall(QTextStream &t, const QString &callPrefix, virtual void writeSubMakeCall(QTextStream &t, const QString &callPrefix,
const QString &makeArguments); const QString &makeArguments);
virtual QString getPdbTarget();
virtual QString defaultInstall(const QString &t); virtual QString defaultInstall(const QString &t);
virtual QStringList &findDependencies(const QString &file); virtual QStringList &findDependencies(const QString &file);
QString var(const ProKey &value) const; QString var(const ProKey &value) const;