diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-20 15:34:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:17:43 +0200 |
| commit | c5954051240ede8b182f96db3ea16be4ac75091c (patch) | |
| tree | 1bec951c466735ae9f47d2aff9a2c183b12a616c /qmake | |
| parent | 14bf7ef504c63f783a0a7be6d6f4354946891e31 (diff) | |
run processPrlFiles() over QMAKE_LIBS_PRIVATE as well
there is no reason why private libs should not have prls resolved.
the two variables are resolved independently, so it's possible that
(even more) libraries will appear duplicated on the linker command line,
but that seems easiest for the time being.
Change-Id: I9070ba53808a0661fa72949db8111106b7aca487
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 5cd3463769..31b1d0d1d2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -574,7 +574,7 @@ UnixMakefileGenerator::processPrlFiles() libdirs.append(QMakeLocalFileName(dlib)); frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks")); frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks")); - const QString lflags[] = { "QMAKE_LIBS", QString() }; + const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; for(int i = 0; !lflags[i].isNull(); i++) { QStringList &l = project->values(lflags[i]); for(int lit = 0; lit < l.size(); ++lit) { diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 5bcd7bb0e1..13b11f6cdc 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -218,7 +218,7 @@ Win32MakefileGenerator::processPrlFiles() { const QString libArg = project->first("QMAKE_L_FLAG"); QList<QMakeLocalFileName> libdirs; - const QString lflags[] = { "QMAKE_LIBS", QString() }; + const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; for (int i = 0; !lflags[i].isNull(); i++) { QStringList &l = project->values(lflags[i]); for (int lit = 0; lit < l.size(); ++lit) { |