Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 8525058..b46005b 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp | |||
@@ -329,33 +329,33 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) | |||
329 | QStringList &libdirs = project->variables()["QMAKE_PBX_LIBPATHS"]; | 329 | QStringList &libdirs = project->variables()["QMAKE_PBX_LIBPATHS"]; |
330 | QString libs[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", QString::null }; | 330 | QString libs[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", QString::null }; |
331 | for(i = 0; !libs[i].isNull(); i++) { | 331 | for(i = 0; !libs[i].isNull(); i++) { |
332 | tmp = project->variables()[libs[i]]; | 332 | tmp = project->variables()[libs[i]]; |
333 | for(QStringList::Iterator it = tmp.begin(); it != tmp.end();) { | 333 | for(QStringList::Iterator it = tmp.begin(); it != tmp.end();) { |
334 | bool remove = FALSE; | 334 | bool remove = FALSE; |
335 | QString library, name, opt = (*it).stripWhiteSpace(); | 335 | QString library, name, opt = (*it).stripWhiteSpace(); |
336 | if(opt.startsWith("-L")) { | 336 | if(opt.startsWith("-L")) { |
337 | QString r = opt.right(opt.length() - 2); | 337 | QString r = opt.right(opt.length() - 2); |
338 | fixEnvVariables(r); | 338 | fixEnvVariables(r); |
339 | libdirs.append(r); | 339 | libdirs.append(r); |
340 | } else if(opt.startsWith("-l")) { | 340 | } else if(opt.startsWith("-l")) { |
341 | name = opt.right(opt.length() - 2); | 341 | name = opt.right(opt.length() - 2); |
342 | QString lib("lib" + name); | 342 | QString lib("lib" + name); |
343 | for(QStringList::Iterator lit = libdirs.begin(); lit != libdirs.end(); ++lit) { | 343 | for(QStringList::Iterator lit = libdirs.begin(); lit != libdirs.end(); ++lit) { |
344 | if(project->isActiveConfig("link_prl")) { | 344 | if(project->isActiveConfig("link_prl")) { |
345 | /* This isn't real nice, but it is real usefull. This looks in a prl | 345 | /* This isn't real nice, but it is real useful. This looks in a prl |
346 | for what the library will ultimately be called so we can stick it | 346 | for what the library will ultimately be called so we can stick it |
347 | in the ProjectFile. If the prl format ever changes (not likely) then | 347 | in the ProjectFile. If the prl format ever changes (not likely) then |
348 | this will not really work. However, more concerning is that it will | 348 | this will not really work. However, more concerning is that it will |
349 | encode the version number in the Project file which might be a bad | 349 | encode the version number in the Project file which might be a bad |
350 | things in days to come? --Sam | 350 | things in days to come? --Sam |
351 | */ | 351 | */ |
352 | QString prl_file = (*lit) + Option::dir_sep + lib + Option::prl_ext; | 352 | QString prl_file = (*lit) + Option::dir_sep + lib + Option::prl_ext; |
353 | if(QFile::exists(prl_file)) { | 353 | if(QFile::exists(prl_file)) { |
354 | QMakeProject proj; | 354 | QMakeProject proj; |
355 | if(proj.read(prl_file, QDir::currentDirPath())) { | 355 | if(proj.read(prl_file, QDir::currentDirPath())) { |
356 | if(!proj.isEmpty("QMAKE_PRL_TARGET")) { | 356 | if(!proj.isEmpty("QMAKE_PRL_TARGET")) { |
357 | library = (*lit) + Option::dir_sep + proj.first("QMAKE_PRL_TARGET"); | 357 | library = (*lit) + Option::dir_sep + proj.first("QMAKE_PRL_TARGET"); |
358 | debug_msg(1, "pbuilder: Found library (%s) via PRL %s (%s)", | 358 | debug_msg(1, "pbuilder: Found library (%s) via PRL %s (%s)", |
359 | opt.latin1(), prl_file.latin1(), library.latin1()); | 359 | opt.latin1(), prl_file.latin1(), library.latin1()); |
360 | remove = TRUE; | 360 | remove = TRUE; |
361 | } | 361 | } |