From 9f5d59f33644aaadd7af43db86734a3294250a02 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 14:18:50 +0900 Subject: [PATCH] qt -> tqt conversion: qtlib -> tqtlib libqt -> libtqt QTLIB -> TQTLIB LIBQT -> LIBTQT Signed-off-by: Michele Calgaro --- INSTALL | 4 ++-- changes.immodule | 2 +- configure | 4 ++-- doc/distributingqt.doc | 4 ++-- doc/html/commonproblems.html | 4 ++-- doc/html/distributingntqt.html | 4 ++-- doc/html/emb-performance.html | 4 ++-- doc/html/install-mac.html | 8 ++++---- doc/html/install-x11.html | 2 +- doc/html/qglobal-h.html | 4 ++-- doc/installation.doc | 10 +++++----- doc/misc.doc | 4 ++-- doc/qws.doc | 4 ++-- mkspecs/linux-kylix/qmake.conf | 2 +- qmake/generators/unix/unixmake2.cpp | 2 +- src/kernel/qtkdeintegration_x11.cpp | 4 ++-- src/qt.pro | 4 ++-- src/tools/ntqglobal.h | 4 ++-- src/tools/qconfig-dist.h | 4 ++-- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/INSTALL b/INSTALL index ea498f9f..f5d28008 100644 --- a/INSTALL +++ b/INSTALL @@ -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 8132f612..5b81496d 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 diff --git a/configure b/configure index 17ec389c..605a7493 100755 --- a/configure +++ b/configure @@ -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 5303ee1a..499104a5 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 55da31fa..c410232c 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 /usr/local/lib: 

 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 .
diff --git a/doc/html/distributingntqt.html b/doc/html/distributingntqt.html index cd47fe17..959996e4 100644 --- a/doc/html/distributingntqt.html +++ b/doc/html/distributingntqt.html @@ -74,8 +74,8 @@ path.

Platform File
Windows qt[version].dll -
Unix/Linux libqt[version].so -
Mac libqt[version].dylib +
Unix/Linux libtqt[version].so +
Mac libtqt[version].dylib

version includes the three version numbers. For threaded builds the version is prefixed with -mt. diff --git a/doc/html/emb-performance.html b/doc/html/emb-performance.html index 7906bba6..27d7caaf 100644 --- a/doc/html/emb-performance.html +++ b/doc/html/emb-performance.html @@ -60,9 +60,9 @@ user invokes it).

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 (libqte.so) and a collection of executables which link dynamically to +suite. This means that rather than having a dynamic library (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 (libqt.a). This +and statically link that with a static library (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/doc/html/install-mac.html b/doc/html/install-mac.html index c8eed6fb..44a8a5cc 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): 

-    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
@@ -117,10 +117,10 @@ case, precede each command with sudo', e.g. sudo ln -s ...). I you use sudo you'll be prompted for the administrator password.

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): 

-    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
diff --git a/doc/html/install-x11.html b/doc/html/install-x11.html index d5db00e8..37823e83 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.

If you have problems running the example programs, e.g. messages like 

-    can't load library 'libqt.so.2'
+    can't load library 'libtqt.so.2'
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 f5bdb6be..73114b7b 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 2b7c5396..dfc5539c 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 8a3f6043..007ee639 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 c6e36626..b294ec7c 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 018ae796..ace807f2 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 cf573b41..7427269f 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 f49181f7..9c16896f 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 011c59d6..9bac14dd 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 f7613a2a..55b7b970 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 ae56b2f2..d6075aa4 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. */