diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-12 18:11:43 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:15:06 +0000 |
commit | a7fe3309d6507b03f7b8d3012612851232a9417c (patch) | |
tree | 20f196e43b9b323832e8267c6ec8201d38a049f0 /qmake | |
parent | 39882d88d0b35ec4f90a2cc1054826c91e619f32 (diff) |
inline initOld()
the separation serves no purpose except confusing.
Change-Id: I6a0d04b2162a4eee7a200345e94baa272120ea5b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 74 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 1 |
2 files changed, 35 insertions, 40 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 865ff8ca4e..81bec7c0c0 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -794,7 +794,41 @@ void VcprojGenerator::init() } MakefileGenerator::init(); - initOld(); // Currently calling old DSP code to set variables. CLEAN UP! + + // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- + const ProStringList &incs = project->values("INCLUDEPATH"); + for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) { + QString inc = (*incit).toQString(); + if (!inc.startsWith('"') && !inc.endsWith('"')) + inc = QString("\"%1\"").arg(inc); // Quote all paths if not quoted already + project->values("MSVCPROJ_INCPATH").append("-I" + inc); + } + + QString dest = Option::fixPathToTargetOS(project->first("TARGET").toQString()) + project->first("TARGET_EXT"); + project->values("MSVCPROJ_TARGET") = ProStringList(dest); + + // DLL COPY ------------------------------------------------------ + if (project->isActiveConfig("dll") && !project->values("DLLDESTDIR").isEmpty()) { + const ProStringList &dlldirs = project->values("DLLDESTDIR"); + QString copydll(""); + ProStringList::ConstIterator dlldir; + for (dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir) { + if (!copydll.isEmpty()) + copydll += " && "; + copydll += "copy \"$(TargetPath)\" \"" + *dlldir + "\""; + } + + QString deststr("Copy " + dest + " to "); + for (dlldir = dlldirs.begin(); dlldir != dlldirs.end();) { + deststr += *dlldir; + ++dlldir; + if (dlldir != dlldirs.end()) + deststr += ", "; + } + + project->values("MSVCPROJ_COPY_DLL").append(copydll); + project->values("MSVCPROJ_COPY_DLL_DESC").append(deststr); + } #if 0 // Verbose output if "-d -d"... @@ -1608,44 +1642,6 @@ void VcprojGenerator::initExtraCompilerOutputs() } } -void VcprojGenerator::initOld() -{ - // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- - const ProStringList &incs = project->values("INCLUDEPATH"); - for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) { - QString inc = (*incit).toQString(); - if (!inc.startsWith('"') && !inc.endsWith('"')) - inc = QString("\"%1\"").arg(inc); // Quote all paths if not quoted already - project->values("MSVCPROJ_INCPATH").append("-I" + inc); - } - - QString dest = Option::fixPathToTargetOS(project->first("TARGET").toQString()) + project->first("TARGET_EXT"); - project->values("MSVCPROJ_TARGET") = ProStringList(dest); - - // DLL COPY ------------------------------------------------------ - if(project->isActiveConfig("dll") && !project->values("DLLDESTDIR").isEmpty()) { - const ProStringList &dlldirs = project->values("DLLDESTDIR"); - QString copydll(""); - ProStringList::ConstIterator dlldir; - for(dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir) { - if(!copydll.isEmpty()) - copydll += " && "; - copydll += "copy \"$(TargetPath)\" \"" + *dlldir + "\""; - } - - QString deststr("Copy " + dest + " to "); - for(dlldir = dlldirs.begin(); dlldir != dlldirs.end();) { - deststr += *dlldir; - ++dlldir; - if(dlldir != dlldirs.end()) - deststr += ", "; - } - - project->values("MSVCPROJ_COPY_DLL").append(copydll); - project->values("MSVCPROJ_COPY_DLL_DESC").append(deststr); - } -} - // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 03f8184f5d..3bf12a320b 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -85,7 +85,6 @@ protected: virtual bool openOutput(QFile &file, const QString &build) const; - void initOld(); virtual void initProject(); void initConfiguration(); void initCompilerTool(); |