Skip to content

Commit

Permalink
Ensure QMAKE_PRL_LIBS is a unique list.
Browse files Browse the repository at this point in the history
Windows static builds currently fail due to overlong command
link lines containing multiple occurrences of base libraries.

Task-number: QTBUG-28131
Change-Id: Ibf7f551fc98c879111b32b27a16f4e96260743c7
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
Friedemann Kleint authored and The Qt Project committed Nov 26, 2012
1 parent 3279ed5 commit 2d79571
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion qmake/meta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,11 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
(*lit) = conf->first("QMAKE_LFLAGS_RPATH") + (*lit).mid(2);
}
}
vars["QMAKE_PRL_LIBS"] += lst;
ProStringList &prlLibs = vars["QMAKE_PRL_LIBS"];
foreach (const ProString &s, lst) {
prlLibs.removeAll(s);
prlLibs.append(s);
}
}
}
return true;
Expand Down

0 comments on commit 2d79571

Please sign in to comment.