summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-10-16 12:26:42 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-16 17:31:31 +0200
commit102e1822ffcdc9954d3c698f863734a8083e349c (patch)
treee89f9012f2a6399a675b6e6845b749b92204553b /qmake/generators
parenta5e7c2802af59d4940e3479288cb9346205b984c (diff)
Remove addition of dependencies for static libraries.
The content in the prl file is not compatible with what CMake expects in the value of the IMPORTED_LINK_INTERFACE_LIBRARIES property. That property expects a list of IMPORTED targets or full paths to libraries. The prl file gives us a whitespace separated string of content suitable for passing to ld, that is, it contains -L and -l content. As this would take a lot of error prone parsing in cmake code in order to resolve the content to a list of full paths to libraries (which can be processed by any cmake generator), it's better to remove the code until qmake is able to generate a list of full paths. Change-Id: I72fe8e862b7f3bd25a7f9a03db94d2e9b815d08a Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/makefile.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 260c7313f4..49f626b2d9 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1010,13 +1010,6 @@ MakefileGenerator::writePrlFile(QTextStream &t)
for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
t << project->values((*it).toKey()).join(' ').replace('\\', "\\\\") << " ";
t << endl;
- t << "QMAKE_PRL_LIBS_FOR_CMAKE = ";
- QString sep;
- for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
- t << sep << project->values((*it).toKey()).join(';').replace('\\', "\\\\");
- sep = ';';
- }
- t << endl;
}
}