qmake vc(x)proj generator: fix handling of DEFINES from .prl files

There was some ancient code putting those defines into MSVCPROJ_DEFINES.
This variable was used for the VC6 generator. We just let MakefileGenerator
handle the variables of a .prl file now.

Task-number: QTBUG-16024
Reviewed-by: Marius Storm-Olsen

2 files changed, 0 insertions, 14 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index b2e5959..f243e86 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1548,19 +1548,6 @@ QString VcprojGenerator::findTemplate(QString file)
     return ret;
 }
 
-void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &l)
-{
-    if(var == "QMAKE_PRL_DEFINES") {
-        QStringList &out = project->values("MSVCPROJ_DEFINES");
-        for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-            if(out.indexOf((*it)) == -1)
-                out.append((" /D " + *it));
-        }
-    } else {
-        MakefileGenerator::processPrlVariable(var, l);
-    }
-}
-
 void VcprojGenerator::outputVariables()
 {
 #if 0
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 656afa9..fdcd73f 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -92,7 +92,6 @@ protected:
     virtual bool mergeBuildProject(MakefileGenerator *other);
 
     virtual bool openOutput(QFile &file, const QString &build) const;
-    virtual void processPrlVariable(const QString &, const QStringList &);
     virtual bool findLibraries();
     virtual void outputVariables();
     QString fixFilename(QString ofile) const;