summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-06 07:58:21 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-06 07:58:21 (GMT)
commit0588b9c8c57fd204372556c7fc376b8d44672fa6 (patch)
treecf919af597a93ad9c506578e9bdd27a89b50f0e2
parent4dcc603919779bda9f5dc052c459d914bdc4949b (diff)
downloadQt-0588b9c8c57fd204372556c7fc376b8d44672fa6.zip
Qt-0588b9c8c57fd204372556c7fc376b8d44672fa6.tar.gz
Qt-0588b9c8c57fd204372556c7fc376b8d44672fa6.tar.bz2
Add hints that a qmake generated .pro will need to be edited
When qmake run with the -project option to generate a .pro for the project it is possible that the generated .pro file will need to be edited and add variables such as "QT" to specify what QT modules the project needs. To hints to qmake's help and HTML documentation to that effect. Reviewed-by: Marius Storm-Olsen
-rw-r--r--doc/src/qmake-manual.qdoc3
-rw-r--r--qmake/option.cpp3
2 files changed, 5 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
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 2308017..5d7cb9b 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -150,6 +150,9 @@ bool usage(const char *a0)
" In this mode qmake interprets files as files to\n"
" be built,\n"
" defaults to %s\n"
+ " Note: The created .pro file probably will \n"
+ " need to be edited. For example add the QT variable to \n"
+ " specify what modules are required.\n"
" -makefile Put qmake into makefile generation mode%s\n"
" In this mode qmake interprets files as project files to\n"
" be processed, if skipped qmake will try to find a project\n"