diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-12 15:44:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-12 17:19:13 +0200 |
| commit | c5195bcb4915b08de741705af8d8fce45bb27090 (patch) | |
| tree | 91892c7aa28c766b5c39d7b1a785b7af7c38cfe2 /qmake/generators/unix | |
| parent | 2a973c031a5ab750504904a0f03ea071c3ee9c9d (diff) | |
remove another symbian remnant: QMAKE_RVCT_LINKSTYLE
Change-Id: Ibac060ecae061c72d4c7076b2d61a5cdd6247420
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 23168cc380..4099d53a12 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -484,9 +484,7 @@ UnixMakefileGenerator::findLibraries() if(!libdirs.contains(f)) libdirs.append(f); } else if(opt.startsWith("-l")) { - if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) { - (*it) = opt.mid(2); - } else if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) { + if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) { (*it) = "lib" + opt.mid(2) + ".so"; } else { stub = opt.mid(2); @@ -535,10 +533,7 @@ UnixMakefileGenerator::findLibraries() + project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit)); if(exists(pathToLib)) { - if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) - (*it) = pathToLib; - else - (*it) = "-l" + stub; + (*it) = "-l" + stub; found = true; break; } |