diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-21 20:48:14 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 11:10:24 +0100 |
commit | a36a19365cc4376a2e972efaa49307fd837d4ebf (patch) | |
tree | 4eeb70553bf0bd3520f40a4eef5703d8486e2b08 | |
parent | 2e35d63fae5191fd7ef4d75647911630b56bfe8d (diff) |
don't overquote deps on .pc and .la files
Change-Id: I00c268b1c0316b6deb0c4e1b2a0c7428e312c682
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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; } |