diff options
| author | axis <qt-info@nokia.com> | 2010-03-09 09:02:49 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-09 09:04:26 (GMT) |
| commit | aaf189b084f524c6e4230fddb25b8494364d83e9 (patch) | |
| tree | 07be47ea9fb260a2f6a68c1e0f2549f42157f2c4 | |
| parent | 9a1b9728cc3a65da6646129c8422fa43ea2afed2 (diff) | |
| download | Qt-aaf189b084f524c6e4230fddb25b8494364d83e9.zip Qt-aaf189b084f524c6e4230fddb25b8494364d83e9.tar.gz Qt-aaf189b084f524c6e4230fddb25b8494364d83e9.tar.bz2 | |
Enabled dependencies for .dso and .lib libraries only.
This adds support for .lib files, as well as removes support for all
others than .dso and .lib. This builds on the original commit
bdff51768dfe.
| -rw-r--r-- | mkspecs/symbian/features/symbian_building.prf | 3 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/symbian/features/symbian_building.prf b/mkspecs/symbian/features/symbian_building.prf index a7663af..f1907c2 100644 --- a/mkspecs/symbian/features/symbian_building.prf +++ b/mkspecs/symbian/features/symbian_building.prf @@ -31,6 +31,7 @@ defineReplace(processSymbianLibraries) { } else { newLIB = "$${library}" } + contains(library, "\.dso$")|contains(library, ".lib$"):PRE_TARGETDEPS += $$library return($$newLIB) } @@ -38,13 +39,11 @@ for(libraries, LIBS) { newLIBS += $$processSymbianLibraries($$libraries) } LIBS = $$newLIBS -PRE_TARGETDEPS += $$replace(newLIBS, "-l", "") newLIBS = for(libraries, QMAKE_LIBS) { newLIBS += $$processSymbianLibraries($$libraries) } QMAKE_LIBS = $$newLIBS -PRE_TARGETDEPS += $$replace(newLIBS, "-l", "") linux-gcce { QMAKE_LIBS += -l:usrt2_2.lib \ diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index cff0138..b9e0ec8 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -178,8 +178,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "export MACOSX_DEPLOYMENT_TARGET = " //exported to children processes << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << endl; - if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) + if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) { t << "vpath %.dso " << project->values("QMAKE_LIBDIR").join(":") << endl; + t << "vpath %.lib " << project->values("QMAKE_LIBDIR").join(":") << endl; + } t << endl; |