diff options
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | changes.immodule | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | doc/distributingqt.doc | 4 | ||||
| -rw-r--r-- | doc/html/commonproblems.html | 4 | ||||
| -rw-r--r-- | doc/html/distributingntqt.html | 4 | ||||
| -rw-r--r-- | doc/html/emb-performance.html | 4 | ||||
| -rw-r--r-- | doc/html/install-mac.html | 8 | ||||
| -rw-r--r-- | doc/html/install-x11.html | 2 | ||||
| -rw-r--r-- | doc/html/qglobal-h.html | 4 | ||||
| -rw-r--r-- | doc/installation.doc | 10 | ||||
| -rw-r--r-- | doc/misc.doc | 4 | ||||
| -rw-r--r-- | doc/qws.doc | 4 | ||||
| -rw-r--r-- | mkspecs/linux-kylix/qmake.conf | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/qtkdeintegration_x11.cpp | 4 | ||||
| -rw-r--r-- | src/qt.pro | 4 | ||||
| -rw-r--r-- | src/tools/ntqglobal.h | 4 | ||||
| -rw-r--r-- | src/tools/qconfig-dist.h | 4 |
19 files changed, 39 insertions, 39 deletions
@@ -94,7 +94,7 @@ the directories where you choose to install Qt. At this point you have binaries created in $QTDIR (eg. $QTDIR/lib/ - contains libqt.so). If, however, you would like to have your Qt + contains libtqt.so). If, however, you would like to have your Qt installed in a non-local installation you can run configure with options splitting TQt into different areas for example: @@ -117,7 +117,7 @@ the directories where you choose to install Qt. If you have problems running the example programs, e.g. messages like - can't load library 'libqt.so.3' + can't load library 'libtqt.so.3' you probably need to put a reference to the qt library in a configuration file and run /sbin/ldconfig as root on your system. diff --git a/changes.immodule b/changes.immodule index 8132f6120..5b81496d3 100644 --- a/changes.immodule +++ b/changes.immodule @@ -117,7 +117,7 @@ General name is still kept as 'input' for backward compatibility - Changed XIM input method to a plugin instead of directly link into - libqt + libtqt - Plugin directory has been changed from $QTDIR/plugins/input/ to $QTDIR/plugins/inputmethods/. Replace install directory with new @@ -1903,8 +1903,8 @@ Configure options: * -release ........... Compile and link TQt with debugging turned off. -debug ............. Compile and link TQt with debugging turned on. - * -shared ............ Create and use a shared TQt library (libqt.so). - -static ............ Create and use a static TQt library (libqt.a). + * -shared ............ Create and use a shared TQt library (libtqt.so). + -static ............ Create and use a static TQt library (libtqt.a). * -no-gif ............ Do not compile in GIF reading support. -qt-gif ............ Compile in GIF reading support. diff --git a/doc/distributingqt.doc b/doc/distributingqt.doc index 5303ee1a1..499104a5b 100644 --- a/doc/distributingqt.doc +++ b/doc/distributingqt.doc @@ -76,8 +76,8 @@ The library is in provided by the following platform specific files: \table \header \i Platform \i File \row \i Windows \i \c qt[version].dll -\row \i Unix/Linux \i \c libqt[version].so -\row \i Mac \i \c libqt[version].dylib +\row \i Unix/Linux \i \c libtqt[version].so +\row \i Mac \i \c libtqt[version].dylib \endtable \e version includes the three version numbers. For threaded builds the diff --git a/doc/html/commonproblems.html b/doc/html/commonproblems.html index 55da31fa0..c410232c7 100644 --- a/doc/html/commonproblems.html +++ b/doc/html/commonproblems.html @@ -162,10 +162,10 @@ you're using, or make links to the libraries in a standard directory like <tt>/usr/local/lib</tt>: <p> <pre> cd /usr/local/lib -ln -s /opt/qt-2.3.1/lib/libqt.so.2 . +ln -s /opt/qt-2.3.1/lib/libtqt.so.2 . ln -s /opt/qt-2.3.1/lib/libtqt-mt.so.2 . ln -s /opt/qt-2.3.1/lib/libqutil.so.1 . -ln -s /opt/qt-3.0.0/lib/libqt.so.3 . +ln -s /opt/qt-3.0.0/lib/libtqt.so.3 . ln -s /opt/qt-3.0.0/lib/libtqui.so.1 . </pre> diff --git a/doc/html/distributingntqt.html b/doc/html/distributingntqt.html index cd47fe172..959996e44 100644 --- a/doc/html/distributingntqt.html +++ b/doc/html/distributingntqt.html @@ -74,8 +74,8 @@ path. <p> <center><table cellpadding="4" cellspacing="2" border="0"> <tr bgcolor="#a2c511"> <th valign="top">Platform <th valign="top">File <tr bgcolor="#f0f0f0"> <td valign="top">Windows <td valign="top"><tt>qt[version].dll</tt> -<tr bgcolor="#d0d0d0"> <td valign="top">Unix/Linux <td valign="top"><tt>libqt[version].so</tt> -<tr bgcolor="#f0f0f0"> <td valign="top">Mac <td valign="top"><tt>libqt[version].dylib</tt> +<tr bgcolor="#d0d0d0"> <td valign="top">Unix/Linux <td valign="top"><tt>libtqt[version].so</tt> +<tr bgcolor="#f0f0f0"> <td valign="top">Mac <td valign="top"><tt>libtqt[version].dylib</tt> </table></center> <p> <em>version</em> includes the three version numbers. For threaded builds the version is prefixed with <em>-mt</em>. diff --git a/doc/html/emb-performance.html b/doc/html/emb-performance.html index 7906bba6d..27d7caaf1 100644 --- a/doc/html/emb-performance.html +++ b/doc/html/emb-performance.html @@ -60,9 +60,9 @@ user invokes it). </h2> <a name="2"></a><p> A lot of CPU and memory is used by the ELF linking process. You can make significant savings by using a static build of your application -suite. This means that rather than having a dynamic library (<tt>libqte.so</tt>) and a collection of executables which link dynamically to +suite. This means that rather than having a dynamic library (<tt>libtqte.so</tt>) and a collection of executables which link dynamically to that library, you build all the applications into a single executable -and statically link that with a static library (<tt>libqt.a</tt>). This +and statically link that with a static library (<tt>libtqt.a</tt>). This improves start-up time, and reduces memory usage, at the expense of flexibility (to add a new application, you must recompile the single executable) and robustness (if one application has a bug, it might diff --git a/doc/html/install-mac.html b/doc/html/install-mac.html index c8eed6fbe..44a8a5cc4 100644 --- a/doc/html/install-mac.html +++ b/doc/html/install-mac.html @@ -106,9 +106,9 @@ configured with the -static option, then in order to be able to launch TQt applications from the Finder you must place the relevant libraries in a directory where they can be found. We recommend making these symbolic links (if you have configured TQt with -thread -please change the libqt below with libtqt-mt): +please change the libtqt below with libtqt-mt): <p> <pre> - ln -sf $QTDIR/lib/libqt.3.dylib /usr/lib + ln -sf $QTDIR/lib/libtqt.3.dylib /usr/lib ln -sf $QTDIR/lib/libtqui.1.dylib /usr/lib </pre> @@ -117,10 +117,10 @@ case, precede each command with <tt>sudo'</tt>, e.g. <tt>sudo ln -s ...</tt>). I you use sudo you'll be prompted for the administrator password. <p> If you do not have administrator access, or you would prefer to do a user install (rather than system install) of the libraries you -can do (if you have configured TQt with -thread please change the libqt +can do (if you have configured TQt with -thread please change the libtqt below with libtqt-mt): <p> <pre> - ln -sf $QTDIR/lib/libqt.3.dylib $HOME/lib + ln -sf $QTDIR/lib/libtqt.3.dylib $HOME/lib ln -sf $QTDIR/lib/libtqui.1.dylib $HOME/lib </pre> diff --git a/doc/html/install-x11.html b/doc/html/install-x11.html index d5db00e88..37823e838 100644 --- a/doc/html/install-x11.html +++ b/doc/html/install-x11.html @@ -112,7 +112,7 @@ If you have problems, see similar at this point if you are using shared libraries. <p> If you have problems running the example programs, e.g. messages like <pre> - can't load library 'libqt.so.2' + can't load library 'libtqt.so.2' </pre> you probably need to put a reference to the qt library in a diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index f5bdb6be8..73114b7b3 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -781,8 +781,8 @@ class TQDataStream; // // Feature subsetting // -// Note that disabling some features will produce a libqt that is not -// compatible with other libqt builds. Such modifications are only +// Note that disabling some features will produce a libtqt that is not +// compatible with other libtqt builds. Such modifications are only // supported on TQt/Embedded where reducing the library size is important // and where the application-suite is often a fixed set. // diff --git a/doc/installation.doc b/doc/installation.doc index 2b7c5396d..dfc5539cd 100644 --- a/doc/installation.doc +++ b/doc/installation.doc @@ -152,7 +152,7 @@ where you choose to install Qt. If you have problems running the example programs, e.g. messages like \code - can't load library 'libqt.so.2' + can't load library 'libtqt.so.2' \endcode you probably need to put a reference to the qt library in a configuration file and run \c /sbin/ldconfig as root on your system. @@ -271,10 +271,10 @@ the directories where you choose to install Qt. launch TQt applications from the Finder you must place the relevant libraries in a directory where they can be found. We recommend making these symbolic links (if you have configured TQt with -thread - please change the libqt below with libtqt-mt): + please change the libtqt below with libtqt-mt): \code - ln -sf $QTDIR/lib/libqt.3.dylib /usr/lib + ln -sf $QTDIR/lib/libtqt.3.dylib /usr/lib ln -sf $QTDIR/lib/libtqui.1.dylib /usr/lib \endcode @@ -284,11 +284,11 @@ the directories where you choose to install Qt. If you do not have administrator access, or you would prefer to do a user install (rather than system install) of the libraries you - can do (if you have configured TQt with -thread please change the libqt + can do (if you have configured TQt with -thread please change the libtqt below with libtqt-mt): \code - ln -sf $QTDIR/lib/libqt.3.dylib $HOME/lib + ln -sf $QTDIR/lib/libtqt.3.dylib $HOME/lib ln -sf $QTDIR/lib/libtqui.1.dylib $HOME/lib \endcode \endlist diff --git a/doc/misc.doc b/doc/misc.doc index 8a3f60434..007ee6399 100644 --- a/doc/misc.doc +++ b/doc/misc.doc @@ -207,10 +207,10 @@ you're using, or make links to the libraries in a standard directory like \code cd /usr/local/lib -ln -s /opt/qt-2.3.1/lib/libqt.so.2 . +ln -s /opt/qt-2.3.1/lib/libtqt.so.2 . ln -s /opt/qt-2.3.1/lib/libtqt-mt.so.2 . ln -s /opt/qt-2.3.1/lib/libqutil.so.1 . -ln -s /opt/qt-3.0.0/lib/libqt.so.3 . +ln -s /opt/qt-3.0.0/lib/libtqt.so.3 . ln -s /opt/qt-3.0.0/lib/libtqui.so.1 . \endcode diff --git a/doc/qws.doc b/doc/qws.doc index c6e366267..b294ec7c5 100644 --- a/doc/qws.doc +++ b/doc/qws.doc @@ -567,9 +567,9 @@ The following guidelines will improve CPU performance: A lot of CPU and memory is used by the ELF linking process. You can make significant savings by using a static build of your application suite. This means that rather than having a dynamic library (\c -libqte.so) and a collection of executables which link dynamically to +libtqte.so) and a collection of executables which link dynamically to that library, you build all the applications into a single executable -and statically link that with a static library (\c libqt.a). This +and statically link that with a static library (\c libtqt.a). This improves start-up time, and reduces memory usage, at the expense of flexibility (to add a new application, you must recompile the single executable) and robustness (if one application has a bug, it might diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf index 018ae7964..ace807f24 100644 --- a/mkspecs/linux-kylix/qmake.conf +++ b/mkspecs/linux-kylix/qmake.conf @@ -59,7 +59,7 @@ QMAKE_LIBS_DYNLOAD = -llibdl QMAKE_LIBS_X11 = -llibXext -llibX11 -llibm QMAKE_LIBS_X11SM = -llibSM -llibICE QMAKE_LIBS_NIS = -llibnsl -QMAKE_LIBS_QT = -llibqt +QMAKE_LIBS_QT = -llibtqt QMAKE_LIBS_QT_THREAD = -llibtqt-mt QMAKE_LIBS_OPENGL = -llibGLU -llibGL -llibXmu QMAKE_LIBS_OPENGL_QT = -llibGL -llibXmu diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index cf573b417..7427269f4 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1545,7 +1545,7 @@ UnixMakefileGenerator::pkgConfigFixPath(TQString path) const } void -UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for libqt so far +UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for libtqt so far { TQString fname = pkgConfigFileName(), lname = fname; int slsh = lname.findRev(Option::dir_sep); diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp index f49181f78..9c16896f2 100644 --- a/src/kernel/qtkdeintegration_x11.cpp +++ b/src/kernel/qtkdeintegration_x11.cpp @@ -27,9 +27,9 @@ static TQCString findLibrary() || getenv( "QT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) { #ifdef USE_LIB64_PATHES - return "/opt/kde3/lib64/kde3/plugins/integration/libqtkde"; + return "/opt/kde3/lib64/kde3/plugins/integration/libtqtkde"; #else - return "/opt/kde3/lib/kde3/plugins/integration/libqtkde"; + return "/opt/kde3/lib/kde3/plugins/integration/libtqtkde"; #endif } return ""; diff --git a/src/qt.pro b/src/qt.pro index 011c59d6c..9bac14dd3 100644 --- a/src/qt.pro +++ b/src/qt.pro @@ -21,8 +21,8 @@ win32-borland { } linux-*:version_script { - QMAKE_LFLAGS += -Wl,--version-script=libqt.map - TARGETDEPS += libqt.map + QMAKE_LFLAGS += -Wl,--version-script=libtqt.map + TARGETDEPS += libtqt.map } KERNEL_CPP = kernel diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index f7613a2a0..55b7b9705 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -749,8 +749,8 @@ class TQDataStream; // // Feature subsetting // -// Note that disabling some features will produce a libqt that is not -// compatible with other libqt builds. Such modifications are only +// Note that disabling some features will produce a libtqt that is not +// compatible with other libtqt builds. Such modifications are only // supported on TQt/Embedded where reducing the library size is important // and where the application-suite is often a fixed set. // diff --git a/src/tools/qconfig-dist.h b/src/tools/qconfig-dist.h index ae56b2f27..d6075aa4d 100644 --- a/src/tools/qconfig-dist.h +++ b/src/tools/qconfig-dist.h @@ -4,8 +4,8 @@ /* Empty leaves all features enabled. See doc/html/features.html for choices. - Note that disabling some features will produce a libqt that is not - compatible with other libqt builds. Such modifications are only + Note that disabling some features will produce a libtqt that is not + compatible with other libtqt builds. Such modifications are only supported on TQt/Embedded where reducing the library size is important and where the application-suite is often a fixed set. */ |