diff options
| author | axis <qt-info@nokia.com> | 2009-12-11 09:28:42 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-11 10:27:15 (GMT) |
| commit | f722cae67b412404d253b5794f638c271fb1eea8 (patch) | |
| tree | 628c8ba0808b5ff987d36a74aca96c6fe281bd3a /qmake | |
| parent | cca653230dd39b4202d6ca7dbe42c35f47958084 (diff) | |
| download | Qt-f722cae67b412404d253b5794f638c271fb1eea8.zip Qt-f722cae67b412404d253b5794f638c271fb1eea8.tar.gz Qt-f722cae67b412404d253b5794f638c271fb1eea8.tar.bz2 | |
Switched to using ABIv2 format to generate Symbian binaries.
This means using elf2e32 instead of elftran, and eliminates the need
for generating exports manually.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 62eee19..7c8e173 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -456,11 +456,7 @@ UnixMakefileGenerator::findLibraries() libdirs.append(f); } else if(opt.startsWith("-l")) { if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) { - if (opt.indexOf(".lib") == -1) { - (*it) = opt.mid(2) + ".lib"; - } else { - (*it) = opt.mid(2); - } + (*it) = opt.mid(2); } else if (project->isActiveConfig("rvct_linker")) { (*it) = "lib" + opt.mid(2) + ".so"; } else { |