From e9ea8cf1332a741eb4e4d115b96d89ff146f850f Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Wed, 24 Feb 2010 16:01:43 +0100 Subject: 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. --- qmake/generators/unix/unixmake.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake/generators/unix/unixmake.cpp') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 346663a26c..030983d07c 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; -- cgit v1.2.1