summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-04-21 19:15:00 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-04-30 15:02:37 (GMT)
commitdf4333e16022ad6c634efe54fe071f437d949896 (patch)
treed734a0e85460c7a1490dd0f6e32a6799d4bb9a71
parentb8d19cdcea39182112e547596bf001fc4584bcae (diff)
downloadQt-df4333e16022ad6c634efe54fe071f437d949896.zip
Qt-df4333e16022ad6c634efe54fe071f437d949896.tar.gz
Qt-df4333e16022ad6c634efe54fe071f437d949896.tar.bz2
s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
Reviewed-by: joerg
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 3e731a1..d16cd6b 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -148,7 +148,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
if(!project->isActiveConfig("staticlib")) {
t << "LINK = " << var("QMAKE_LINK") << endl;
t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl;
- t << "LIBS = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKDIR_FLAGS") << " "
+ t << "LIBS = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKPATH_FLAGS") << " "
<< var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl;
}