diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:25:10 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-06 12:25:10 (GMT) |
| commit | 9923c171853b2f8b4a3a6b096d263fa6cf461a0b (patch) | |
| tree | 38ea3966fcd11725c7d3c1606be637a000c233fd /doc | |
| parent | bc83b5856416e5927822ee3e758d231fc9f43c38 (diff) | |
| parent | 8dbc32699dec7aa928eb9518c05437f481d11a43 (diff) | |
| download | Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.zip Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.gz Qt-9923c171853b2f8b4a3a6b096d263fa6cf461a0b.tar.bz2 | |
merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/qmake-manual.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc index 0921ae7..211d7e9 100644 --- a/doc/src/qmake-manual.qdoc +++ b/doc/src/qmake-manual.qdoc @@ -558,7 +558,8 @@ \o \c -makefile \BR \c qmake output will be a Makefile. \o \c -project \BR - \c qmake output will be a project file. + \c qmake output will be a project file. \BR +\bold{Note:} It is likely that the created file will need to be edited for example adding the \c QT variable to suit what modules are required for the project. \endlist The following \c options are used to specify both general and mode-specific |