diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CHANGES | 4 | ||||
| -rw-r--r-- | qmake/book/qmake-commandreference.leaf | 36 | ||||
| -rw-r--r-- | qmake/book/qmake-concepts.leaf | 10 | ||||
| -rw-r--r-- | qmake/book/qmake-install.leaf | 6 | ||||
| -rw-r--r-- | qmake/book/qmake-pch.leaf | 2 | ||||
| -rw-r--r-- | qmake/book/qmake-preface.leaf | 2 |
6 files changed, 30 insertions, 30 deletions
diff --git a/qmake/CHANGES b/qmake/CHANGES index ca786eea8..a203791ee 100644 --- a/qmake/CHANGES +++ b/qmake/CHANGES @@ -53,7 +53,7 @@ 2) library dependencies, when on .pro depends on another library - it will automatically build that other library (unix makefiles only) 3) automatic detection of configurations for Qt, if CONFIG qt is specified - it will find the settings for the most recent Qt itself. + it will find the settings for the most recent TQt itself. Project Builder for Mac OS X is now a supported backend for qmake. @@ -63,6 +63,6 @@ 1.00a - - First release, shipped with Qt 3.0. + First release, shipped with TQt 3.0. qmake ships with support for Unix make, MSVC (both dsp and nmake), Borland make. diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf index db7f7d3d7..329648cf9 100644 --- a/qmake/book/qmake-commandreference.leaf +++ b/qmake/book/qmake-commandreference.leaf @@ -199,7 +199,7 @@ These \c CONFIG values control compilation flags: These options define the application/library type: \list -\i qt - The target is a Qt application/library and requires the Qt header +\i qt - The target is a TQt application/library and requires the TQt header files/library. The proper include and library paths for the Qt library will automatically be added to the project. \i opengl - The target requires the OpenGL (or Mesa) @@ -336,7 +336,7 @@ For example: \section3 FORMS This variable specifies the .ui files (see \link -designer-manual.book Qt Designer \endlink) to be processed through \e uic +designer-manual.book TQt Designer \endlink) to be processed through \e uic before compiling. All dependencies, headers and source files required to build these .ui files will automatically be added to the project. @@ -772,7 +772,7 @@ and rarely needs to be modified. \section3 QMAKE_CFLAGS_MT This variable contains the compiler flags for creating a -multi-threaded application or when the version of Qt that you link +multi-threaded application or when the version of TQt that you link against is a multi-threaded statically linked library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -784,7 +784,7 @@ this variable is typically handled by \e qmake or \section3 QMAKE_CFLAGS_MT_DBG This variable contains the compiler flags for creating a debuggable -multi-threaded application or when the version of Qt that you link +multi-threaded application or when the version of TQt that you link against is a debuggable multi-threaded statically linked library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -798,7 +798,7 @@ value of this variable is typically handled by \e qmake or \e {This is used on Windows only} This variable contains the compiler flags for creating a -multi-threaded dll or when the version of Qt that you link +multi-threaded dll or when the version of TQt that you link against is a multi-threaded dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -812,7 +812,7 @@ rarely needs to be modified. \e {This is used on Windows only} This variable contains the compiler flags for creating a debuggable -multi-threaded dll or when the version of Qt that you link +multi-threaded dll or when the version of TQt that you link against is a debuggable multi-threaded statically linked library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1074,7 +1074,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_INCDIR_QT This variable contains the location of all known header file -paths to be added to INCLUDEPATH when building a Qt application. The value +paths to be added to INCLUDEPATH when building a TQt application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1151,7 +1151,7 @@ of this variable is typically handled by \e qmake or \section3 QMAKE_LFLAGS_QT_DLL This variable contains link flags when building programs that -use the Qt library built as a dll. The value of this variable is +use the TQt library built as a dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1279,7 +1279,7 @@ directory.The value of this variable is typically handled by \section3 QMAKE_LIBDIR_QT -This variable contains the location of the Qt library +This variable contains the location of the TQt library directory.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1328,7 +1328,7 @@ variable is typically handled by \e qmake or \section3 QMAKE_LIBS_OPENGL_QT -This variable contains all OpenGL Qt libraries.The value of this +This variable contains all OpenGL TQt libraries.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1338,7 +1338,7 @@ variable is typically handled by \e qmake or \section3 QMAKE_LIBS_QT -This variable contains all Qt libraries.The value of this +This variable contains all TQt libraries.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1350,7 +1350,7 @@ variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable contains all Qt libraries when Qt is built as a dll. The +This variable contains all TQt libraries when TQt is built as a dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1527,7 +1527,7 @@ The value of this variable is typically handled by \e qmake or \section3 QMAKE_QT_DLL -This variable is not empty if Qt was built as a dll. The +This variable is not empty if TQt was built as a dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1904,7 +1904,7 @@ qmake -query "1.06a/VARIABLE" \endcode qmake also has the notion of 'builtin' properties, for example you can -query the installation of Qt for this version of qmake with the +query the installation of TQt for this version of qmake with the QT_INSTALL_PREFIX property: \code @@ -1916,8 +1916,8 @@ they are not versioned and each qmake will have its own notion of these values. The list below outlines the builtin properties: \list -\i QT_INSTALL_PREFIX - Where the version of Qt this qmake is built for resides -\i QT_INSTALL_DATA - Where data for this version of Qt resides +\i QT_INSTALL_PREFIX - Where the version of TQt this qmake is built for resides +\i QT_INSTALL_DATA - Where data for this version of TQt resides \i QMAKE_VERSION - The current version of qmake \endlist @@ -1936,8 +1936,8 @@ QMAKE_VERS = $$[QMAKE_VERSION] \e qmake requires a platform and compiler description file which contains many default values used to generate appropriate makefiles. -The standard Qt distribution comes with many of these files, located -in the 'mkspecs' subdirectory of the Qt installation. +The standard TQt distribution comes with many of these files, located +in the 'mkspecs' subdirectory of the TQt installation. The QMAKESPEC environment variable can contain any of the following: diff --git a/qmake/book/qmake-concepts.leaf b/qmake/book/qmake-concepts.leaf index 8275a235d..929ba6202 100644 --- a/qmake/book/qmake-concepts.leaf +++ b/qmake/book/qmake-concepts.leaf @@ -6,8 +6,8 @@ for development projects across different platforms. \e qmake simplifies the generation of makefiles so that only a few lines of information are needed to create a makefile. \e qmake can be used for -any software project whether it is written in Qt or not, although it -also contains additional features to support Qt development. +any software project whether it is written in TQt or not, although it +also contains additional features to support TQt development. \e qmake generates a makefile based on the information in a project file. Project files are created by the developer. Project files are @@ -163,7 +163,7 @@ The following options control what compiler flags are used: The following options define the type of library/application to be built: \list -\i qt - The application is a Qt application and should link against the Qt library. +\i qt - The application is a TQt application and should link against the TQt library. \i thread - The application is a multi-threaded application. \i x11 - The application is an X11 application or library. \i windows - 'app' template only: the application is a Windows window application. @@ -173,7 +173,7 @@ The following options define the type of library/application to be built: \i plugin - 'lib' template only: The library is a plugin; this enables the dll option. \endlist -For example, if your application uses the Qt library and you want to +For example, if your application uses the TQt library and you want to build it as a debuggable multi-threaded application, your project file will have the following line: @@ -182,6 +182,6 @@ will have the following line: \endcode Note, that you must use "+=", not "=", or \e qmake will not be able to -use the settings used to build Qt as a guide as what type of Qt +use the settings used to build TQt as a guide as what type of Qt library was built. diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf index 5a661d995..508fd3f81 100644 --- a/qmake/book/qmake-install.leaf +++ b/qmake/book/qmake-install.leaf @@ -2,14 +2,14 @@ \section1 Installing qmake -\e qmake is built by default when Qt is built. +\e qmake is built by default when TQt is built. This section explains how to build \e qmake manually. Skip ahead to \l{The 10 minute guide to using qmake}, if you already have \e qmake. \section2 Installing qmake manually -Before building Qt manually the following environment variables must +Before building TQt manually the following environment variables must be set: \list @@ -37,7 +37,7 @@ 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 Qt is (or will be) installed. +\i QTDIR \BR This must be set to where TQt is (or will be) installed. For example, \e {c:\\qt} and \e {\\local\\qt} \endlist diff --git a/qmake/book/qmake-pch.leaf b/qmake/book/qmake-pch.leaf index b4a41e8a0..420af717c 100644 --- a/qmake/book/qmake-pch.leaf +++ b/qmake/book/qmake-pch.leaf @@ -56,7 +56,7 @@ like this: #include <stdlib> #include <iostream> #include <vector> - #include <ntqapplication.h> // Qt includes + #include <ntqapplication.h> // TQt includes #include <ntqpushbutton.h> #include <ntqlabel.h> #include "thirdparty/include/libmain.h" diff --git a/qmake/book/qmake-preface.leaf b/qmake/book/qmake-preface.leaf index 50880f5a3..f63d171c0 100644 --- a/qmake/book/qmake-preface.leaf +++ b/qmake/book/qmake-preface.leaf @@ -11,7 +11,7 @@ combinations. With \e qmake, developers create a simple single 'project' file and run \e qmake to generate the appropriate makefiles. \e qmake takes care of all the compiler and platform dependencies, freeing developers to focus on their code. Trolltech -uses \e qmake as the primary build tool for the Qt library, and for +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 |