summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-20 09:56:16 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-20 09:56:16 (GMT)
commit7b962163d416f62f862c736738dddd58c1a617bc (patch)
treec54e96db1375adae16e8172af52d472666d52ef4 /qmake
parent821619ea1a4962b87e509c9aeedb35cd6a4b0434 (diff)
downloadQt-7b962163d416f62f862c736738dddd58c1a617bc.zip
Qt-7b962163d416f62f862c736738dddd58c1a617bc.tar.gz
Qt-7b962163d416f62f862c736738dddd58c1a617bc.tar.bz2
Add support for LIBS_PRIVATE to the Symbian generators.
Qt added a new internal variable called LIBS_PRIVATE that should be added to the libraries section of the generated build file. Add this to bring us up to parity with the other platforms. Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symmake.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 4665912..c20ecf3 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -479,6 +479,7 @@ void SymbianMakefileGenerator::init()
project->values("QMAKESPEC").append(qgetenv("QMAKESPEC"));
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+ project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
// bld.inf
project->values("MAKEFILE") += BLD_INF_FILENAME;
@@ -878,7 +879,7 @@ void SymbianMakefileGenerator::writeMmpFileIncludePart(QTextStream& t)
void SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t)
{
QStringList &libs = project->values("LIBS");
- libs << project->values("QMAKE_LIBS");
+ libs << project->values("QMAKE_LIBS") << project->values("QMAKE_LIBS_PRIVATE");
removeDuplicatedStrings(libs);