summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-06 10:23:50 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-06 10:23:50 (GMT)
commit6d1ba5590c99ad92de75ecd8bc9921921123d809 (patch)
tree9a6d48d0852bb5a67eb208412fb78c7730e449ef /doc
parentb67938a45ae548de42773a735d9284848ac46d88 (diff)
parentd071b3528f51aaded18029f2f22e8db03e47a2a6 (diff)
downloadQt-6d1ba5590c99ad92de75ecd8bc9921921123d809.zip
Qt-6d1ba5590c99ad92de75ecd8bc9921921123d809.tar.gz
Qt-6d1ba5590c99ad92de75ecd8bc9921921123d809.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc')
-rw-r--r--doc/src/qmake-manual.qdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index 27cfa0b..39581a2 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -3080,6 +3080,9 @@
called \c{.qmake.cache} in parent directories of the current directory. If
it fails to find this file, it will silently ignore this step of processing.
+ If it finds a \c{.qmake.cache} file then it will process this file first before
+ it processes the project file.
+
\target LibDepend
\section1 Library Dependencies