diff options
| author | axis <qt-info@nokia.com> | 2010-03-08 16:22:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-08 16:22:07 (GMT) |
| commit | 9a1b9728cc3a65da6646129c8422fa43ea2afed2 (patch) | |
| tree | c7892cceefaf71e45e3e2957f7d3d455954c51ee /qmake | |
| parent | 86ef6dc634ccf8518188a73262aa95b782352f20 (diff) | |
| parent | 16113ecd5135aea01aac1fa3954143e59269bd50 (diff) | |
| download | Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.zip Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.tar.gz Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.tar.bz2 | |
Merge branch 'defFilesAndMisc'
Conflicts:
mkspecs/common/symbian/symbian-makefile.conf
mkspecs/symbian/features/symbian_building.prf
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 6516786..cff0138 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -177,6 +177,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) if(!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET")) t << "export MACOSX_DEPLOYMENT_TARGET = " //exported to children processes << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << endl; + + if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) + t << "vpath %.dso " << project->values("QMAKE_LIBDIR").join(":") << endl; + t << endl; t << "####### Output directory" << endl << endl; |