diff options
Diffstat (limited to 'qmake/book')
-rw-r--r-- | qmake/book/qmake-commandreference.leaf | 12 | ||||
-rw-r--r-- | qmake/book/qmake-preface.leaf | 2 | ||||
-rw-r--r-- | qmake/book/qmake-tutorial.leaf | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf index 9b0a1b964..965d96190 100644 --- a/qmake/book/qmake-commandreference.leaf +++ b/qmake/book/qmake-commandreference.leaf @@ -303,7 +303,7 @@ Defines the header files for the project. \e qmake will generate dependency information (unless -nodepend is specified on the \link #Commands command line \endlink) for the specified headers. \e qmake will also automatically detect if -\e moc is required by the classes in these headers, and add the +\e tqmoc is required by the classes in these headers, and add the appropriate dependencies and files to the project for generating and linking the moc files. @@ -579,7 +579,7 @@ automatically be included in the project. For example: \code -YACCSOURCES = moc.y +YACCSOURCES = tqmoc.y \endcode @@ -694,7 +694,7 @@ On other platforms, this variable has different meaning, as noted below. This variable contains a list of header files that require some -sort of pre-compilation step (such as with moc). The value of this +sort of pre-compilation step (such as with tqmoc). The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -880,7 +880,7 @@ to be modified. \target QMAKE_CLEAN \section3 QMAKE_CLEAN -This variable contains any files which are not generated files (such as moc and uic +This variable contains any files which are not generated files (such as tqmoc and tquic generated files) and object files that should be removed when using "make clean". @@ -2138,8 +2138,8 @@ For convenience there is also a method of customizing (UNIX) projects for generic new compilers (or even preprocessors). \code -new_moc.output = moc_${QMAKE_FILE_BASE}.cpp -new_moc.commands = moc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT} +new_moc.output = tqmoc_${QMAKE_FILE_BASE}.cpp +new_moc.commands = tqmoc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT} new_moc.depends = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,," new_moc.input = NEW_HEADERS QMAKE_EXTRA_UNIX_COMPILERS += new_moc diff --git a/qmake/book/qmake-preface.leaf b/qmake/book/qmake-preface.leaf index f63d171c0..59230c092 100644 --- a/qmake/book/qmake-preface.leaf +++ b/qmake/book/qmake-preface.leaf @@ -15,4 +15,4 @@ uses \e qmake as the primary build tool for the TQt library, and for the tools supplied with Qt. \e qmake also takes care of Qt's special requirements, automatically -including build rules for \link moc.html moc\endlink and \e uic. +including build rules for \link tqmoc.html tqmoc\endlink and \e uic. diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf index 81e21d18d..49f5f8560 100644 --- a/qmake/book/qmake-tutorial.leaf +++ b/qmake/book/qmake-tutorial.leaf @@ -72,7 +72,7 @@ you can set it in the project file: The final step is to set the \e CONFIG variable. Since this is a Qt application, we need to put 'qt' on the CONFIG line so that \e qmake will add the relevant libraries to be linked against and ensure that -build lines for \e moc and \e uic are included in the makefile. +build lines for \e tqmoc and \e tquic are included in the makefile. The finished project file should look like this: \code |