MakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
{
if(var == "QMAKE_PRL_LIBS") {
- QString where = "QMAKE_LIBS";
- if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
- where = project->first("QMAKE_INTERNAL_PRL_LIBS");
- QStringList &out = project->values(where);
+ QStringList &out = project->values("QMAKE_LIBS");
for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
if(out.indexOf((*it)) == -1)
out.append((*it));
for(bool ret = false; true; ret = false) {
//read in any prl files included..
QStringList l_out;
- QString where = "QMAKE_LIBS";
- if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
- where = project->first("QMAKE_INTERNAL_PRL_LIBS");
- QStringList &l = project->values(where);
+ QStringList &l = project->values("QMAKE_LIBS");
for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
QString file = (*it);
if(!processed.contains(file) && processPrlFile(file)) {
bool MingwMakefileGenerator::findLibraries()
{
- return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE");
-}
-
-bool MingwMakefileGenerator::findLibraries(const QString &where)
-{
- QStringList &l = project->values(where);
-
QList<QMakeLocalFileName> dirs;
{
const QStringList &libpaths = project->values("QMAKE_LIBDIR");
dirs.append(QMakeLocalFileName((*libpathit)));
}
+ const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() };
+ for (int i = 0; !lflags[i].isNull(); i++) {
+ QStringList &l = project->values(lflags[i]);
QStringList::Iterator it = l.begin();
while (it != l.end()) {
if ((*it).startsWith("-l")) {
++it;
}
+ }
return true;
}
QString preCompHeaderOut;
virtual bool findLibraries();
- bool findLibraries(const QString &where);
void fixTargetExt();
bool init_flag;
} else if(project->first("TEMPLATE") == "vclib") {
if(project->isActiveConfig("staticlib")) {
if (!project->values("RES_FILE").isEmpty())
- project->values("MSVCPROJ_LIBS") += escapeFilePaths(project->values("RES_FILE"));
+ project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
projectTarget = StaticLib;
} else
projectTarget = SharedLib;
if (!project->values("DEF_FILE").isEmpty())
conf.linker.ModuleDefinitionFile = project->first("DEF_FILE");
- foreach(QString libs, project->values("MSVCPROJ_LIBS")) {
+ foreach (QString libs, project->values("QMAKE_LIBS") + project->values("QMAKE_LIBS_PRIVATE")) {
if (libs.left(9).toUpper() == "/LIBPATH:") {
QStringList l = QStringList(libs);
conf.linker.parseOptions(l);
// FIXME: This code should actually resolve the libraries from all Qt modules.
const QString &qtdir = QLibraryInfo::rawLocation(QLibraryInfo::LibrariesPath,
QLibraryInfo::EffectivePaths);
- const QStringList &arg = project->values("MSVCPROJ_LIBS");
+ QStringList arg = project->values("QMAKE_LIBS") + project->values("QMAKE_LIBS_PRIVATE");
for (QStringList::ConstIterator it = arg.constBegin(); it != arg.constEnd(); ++it) {
if (it->contains(qtdir)) {
QString dllName = *it;
void VcprojGenerator::initOld()
{
// $$QMAKE.. -> $$MSVCPROJ.. -------------------------------------
- project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS");
- project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS_PRIVATE");
const QStringList &incs = project->values("INCLUDEPATH");
for (QStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) {
QString inc = (*incit);
project->values("MSVCPROJ_COPY_DLL_DESC").append(deststr);
}
- project->values("QMAKE_INTERNAL_PRL_LIBS") << "MSVCPROJ_LIBS";
-
// Verbose output if "-d -d"...
outputVariables();
}
virtual bool mergeBuildProject(MakefileGenerator *other);
virtual bool openOutput(QFile &file, const QString &build) const;
- virtual bool findLibraries();
virtual void outputVariables();
QString fixFilename(QString ofile) const;
return project->first("TARGET") + project->first("VCPROJ_EXTENSION");
}
-inline bool VcprojGenerator::findLibraries()
-{
- return Win32MakefileGenerator::findLibraries("MSVCPROJ_LIBS");
-}
-
QT_END_NAMESPACE
#endif // MSVC_VCPROJ_H
}
bool
-Win32MakefileGenerator::findLibraries(const QString &where)
+Win32MakefileGenerator::findLibraries()
{
- QStringList &l = project->values(where);
QList<QMakeLocalFileName> dirs;
{
const QStringList &libpaths = project->values("QMAKE_LIBDIR");
libpathit != libpaths.end(); ++libpathit)
dirs.append(QMakeLocalFileName((*libpathit)));
}
+ const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() };
+ for (int i = 0; !lflags[i].isNull(); i++) {
+ QStringList &l = project->values(lflags[i]);
for(QStringList::Iterator it = l.begin(); it != l.end();) {
QChar quote;
bool modified_opt = false, remove = false;
++it;
}
}
+ }
return true;
}
for(bool ret = false; true; ret = false) {
//read in any prl files included..
QStringList l_out;
- QString where = "QMAKE_LIBS";
- if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
- where = project->first("QMAKE_INTERNAL_PRL_LIBS");
- QStringList l = project->values(where);
+ QStringList l = project->values("QMAKE_LIBS");
for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
QString opt = (*it).trimmed();
if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0])
virtual void writeRcFilePart(QTextStream &t);
int findHighestVersion(const QString &dir, const QString &stem, const QString &ext = QLatin1String("lib"));
- bool findLibraries(const QString &);
virtual bool findLibraries();
virtual void processPrlFiles();
inline Win32MakefileGenerator::~Win32MakefileGenerator()
{ }
-inline bool Win32MakefileGenerator::findLibraries()
-{ return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE"); }
-
QT_END_NAMESPACE
#endif // WINMAKEFILE_H