diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-02-24 15:01:43 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-02-24 17:20:11 (GMT) |
| commit | e9ea8cf1332a741eb4e4d115b96d89ff146f850f (patch) | |
| tree | 6a16134fb471ab666df548ed8a87f55da4ee3b1c /qmake | |
| parent | 9f0899d86afcc2304c9de824c43e363d2a881339 (diff) | |
| download | Qt-e9ea8cf1332a741eb4e4d115b96d89ff146f850f.zip Qt-e9ea8cf1332a741eb4e4d115b96d89ff146f850f.tar.gz Qt-e9ea8cf1332a741eb4e4d115b96d89ff146f850f.tar.bz2 | |
Make gcce xcompiler for symbian compile+link QtCore
This moves some stuff from the common to linux-armcc specific
and updates the cloned gcce specs to do the right thing.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 346663a..030983d 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -455,7 +455,7 @@ UnixMakefileGenerator::findLibraries() if(!libdirs.contains(f)) libdirs.append(f); } else if(opt.startsWith("-l")) { - if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) { + if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) { (*it) = opt.mid(2); } else if (project->isActiveConfig("rvct_linker")) { (*it) = "lib" + opt.mid(2) + ".so"; @@ -509,7 +509,7 @@ UnixMakefileGenerator::findLibraries() + project->values("QMAKE_PREFIX_SHLIB").first() + stub + "." + (*extit)); if(exists(pathToLib)) { - if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) + if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) (*it) = pathToLib; else (*it) = "-l" + stub; |