1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove another symbian remnant: QMAKE_RVCT_LINKSTYLE

Browse Source 
Change-Id: Ibac060ecae061c72d4c7076b2d61a5cdd6247420
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-12 15:44:34 +02:00 committed by Qt by Nokia
parent 2a973c031a
commit c5195bcb49
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/generators/unix/unixmake.cpp
View File

@ -484,9 +484,7 @@ UnixMakefileGenerator::findLibraries()
if(!libdirs.contains(f)) if(!libdirs.contains(f))
libdirs.append(f); libdirs.append(f);
} else if(opt.startsWith("-l")) { } else if(opt.startsWith("-l")) {
if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) { if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) {
(*it) = opt.mid(2);
} else if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) {
(*it) = "lib" + opt.mid(2) + ".so"; (*it) = "lib" + opt.mid(2) + ".so";
} else { } else {
stub = opt.mid(2); stub = opt.mid(2);
@ -535,9 +533,6 @@ UnixMakefileGenerator::findLibraries()
+ project->values("QMAKE_PREFIX_SHLIB").first() + project->values("QMAKE_PREFIX_SHLIB").first()
+ stub + "." + (*extit)); + stub + "." + (*extit));
if(exists(pathToLib)) { if(exists(pathToLib)) {
if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE"))
(*it) = pathToLib;
else
(*it) = "-l" + stub; (*it) = "-l" + stub;
found = true; found = true;
break; break;