From 7d4bc536a27be540516a0403e114668f9eee65bb Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 Apr 2014 18:25:52 -0700 Subject: Don't fileFixify PRECOMPILED_HEADER twice fileFixify must not be called twice on the same file path, since it will convert an absolute path from the shadow build to an absolute path in the source dir. The first fileFixify occurs in MakefileGenerator::init, along with the fixifying of INCLUDEPATH. Change-Id: I607870573a80eaf834ea5f540bbe1451ec983114 Reviewed-by: Oswald Buddenhagen --- qmake/generators/unix/unixmake.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index cadd5cf316..c11259d5a1 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -210,7 +210,7 @@ UnixMakefileGenerator::init() // replace place holders pchFlags = pchFlags.replace("${QMAKE_PCH_INPUT}", - fileFixify(project->first("PRECOMPILED_HEADER").toQString())); + project->first("PRECOMPILED_HEADER").toQString()); pchFlags = pchFlags.replace("${QMAKE_PCH_OUTPUT_BASE}", pchBaseName); if (project->isActiveConfig("icc_pch_style")) { // icc style -- cgit v1.2.3