diff options
Diffstat (limited to 'qmake/book')
| -rw-r--r-- | qmake/book/qmake-commandreference.leaf | 10 | ||||
| -rw-r--r-- | qmake/book/qmake-install.leaf | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf index 329648cf9..3cc198b0b 100644 --- a/qmake/book/qmake-commandreference.leaf +++ b/qmake/book/qmake-commandreference.leaf @@ -1070,8 +1070,8 @@ value of this variable is typically handled by \e qmake or -\target QMAKE_INCDIR_QT -\section3 QMAKE_INCDIR_QT +\target QMAKE_INCDIR_TQT +\section3 QMAKE_INCDIR_TQT This variable contains the location of all known header file paths to be added to INCLUDEPATH when building a TQt application. The value @@ -1277,7 +1277,7 @@ directory.The value of this variable is typically handled by -\section3 QMAKE_LIBDIR_QT +\section3 QMAKE_LIBDIR_TQT This variable contains the location of the TQt library directory.The value of this variable is typically handled by @@ -1793,7 +1793,7 @@ matches the regular expression specified. For example: \code -exists( $(QTDIR)/lib/libtqt-mt* ) { +exists( $(TQTDIR)/lib/libtqt-mt* ) { message( "Configuring for multi-threaded Qt..." ) CONFIG += thread } @@ -1943,7 +1943,7 @@ The QMAKESPEC environment variable can contain any of the following: \list \i A complete path to a directory containing a qmake.conf file. In this case \e qmake will open the qmake.conf file from within that directory. If the file does not exist, \e qmake will exit with an error. -\i The name of a platform-compiler combination. In this case, \e qmake will search in the directory specified by the QTDIR environment variable. +\i The name of a platform-compiler combination. In this case, \e qmake will search in the directory specified by the TQTDIR environment variable. \endlist Note: the QMAKESPEC path will automatically be added to the diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf index 508fd3f81..b988713e1 100644 --- a/qmake/book/qmake-install.leaf +++ b/qmake/book/qmake-install.leaf @@ -37,12 +37,12 @@ one of the following: linux-arm-g++ linux-generic-g++ linux-mips-g++ linux-x86-g++ linux-freebsd-g++ linux-ipaq-g++ linux-solaris-g++ qnx-rtp-g++ -\i QTDIR \BR This must be set to where TQt is (or will be) installed. +\i TQTDIR \BR This must be set to where TQt is (or will be) installed. For example, \e {c:\\qt} and \e {\\local\\qt} \endlist Once the environment variables are set go into the qmake directory, \e -$QTDIR/qmake, e.g. \e{C:\\qt\\qmake}. Now run \e make or \e nmake +$TQTDIR/qmake, e.g. \e{C:\\qt\\qmake}. Now run \e make or \e nmake depending on your compiler. When the make has completed, \e qmake is ready for use. |