summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-20 15:23:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-31 11:17:37 +0200
commitf71a5c8cde492b41285309b86856b6e82354fa2e (patch)
tree7a478b4f38ddd15945fb34edbe38173f404f3dd5 /qmake/generators/unix
parent202f08dc097d7d195c822e819393b0cc3a8f919b (diff)
make the windows prl processing more like the unix variant
it's more elegant, and more similar code is better. Change-Id: I2b8b036cb70a932fd171e23cf7d3389188401924 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r--qmake/generators/unix/unixmake.cpp9
-rw-r--r--qmake/generators/unix/unixmake.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index dc991ab9d3..5cd3463769 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -388,15 +388,6 @@ UnixMakefileGenerator::init()
}
}
-void
-UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
-{
- if(var == "QMAKE_PRL_LIBS") {
- project->values("QMAKE_CURRENT_PRL_LIBS") += l;
- } else
- MakefileGenerator::processPrlVariable(var, l);
-}
-
QStringList
&UnixMakefileGenerator::findDependencies(const QString &file)
{
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 24e8c45264..8fb005200b 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -61,7 +61,6 @@ protected:
virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
virtual bool doDepends() const { return !Option::mkfile::do_stub_makefile && MakefileGenerator::doDepends(); }
virtual QString defaultInstall(const QString &);
- virtual void processPrlVariable(const QString &, const QStringList &);
virtual void processPrlFiles();
virtual bool findLibraries();