From a36a19365cc4376a2e972efaa49307fd837d4ebf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 20:48:14 +0100 Subject: don't overquote deps on .pc and .la files Change-Id: I00c268b1c0316b6deb0c4e1b2a0c7428e312c682 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- qmake/generators/unix/unixmake2.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 8447d66c06..c22d5da06c 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -665,20 +665,16 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) writeMakeQmake(t); if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) { - QString meta_files; + QStringList meta_files; if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("compile_libtool")) { //libtool - if(!meta_files.isEmpty()) - meta_files += " "; meta_files += libtoolFileName(); } if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib") { //pkg-config - if(!meta_files.isEmpty()) - meta_files += " "; meta_files += pkgConfigFileName(); } if(!meta_files.isEmpty()) - t << escapeDependencyPath(meta_files) << ": " << "\n\t" + t << escapeDependencyPaths(meta_files).join(" ") << ": " << "\n\t" << "@$(QMAKE) -prl " << buildArgs() << " " << project->projectFile() << endl; } -- cgit v1.2.3