TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

qt -> tqt conversion:

Browse Source 
qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 2570c69db3
commit fc9e3d92cf
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

4
INSTALL
Unescape View File

@ -49,7 +49,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
If you're compiling the svn version of KVirc run ./autogen.sh
(You NEED automake >= 1.5 for autogen.sh to run).
# export QTDIR="your qtlibrary path"
# export QTDIR="your tqtlibrary path"
eventually:
@ -690,7 +690,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
Well, for the third it's really easy, just follow carefully those steps:
1. Install qt-embedded libraries (including the development files).
This can be as easy as: apt-get install libqt-emb-dev on Debian.
This can be as easy as: apt-get install libtqt-emb-dev on Debian.
2. cd to the KVIrc3 source directory

70
acinclude.m4
Unescape View File

@ -1105,7 +1105,7 @@ AC_DEFUN([AC_SS_CHECK_ARTS],
ss_save_LIBS="$LIBS"
CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
CXXFLAGS="-O2 -Wall $CXXFLAGS"
LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -ltdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -ltdecore -l$SS_TQTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
fi
@ -1487,8 +1487,8 @@ AC_DEFUN([AC_SS_FIND_QT],
AC_DEFUN([AC_SS_FIND_QT3_NAME],
[
AC_MSG_CHECKING([for the Qt library name])
AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"qt\" as Qt library name],SS_QTLIB_NAME="$withval",SS_QTLIB_NAME="qt")
AC_MSG_RESULT("$SS_QTLIB_NAME")
AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"qt\" as Qt library name],SS_TQTLIB_NAME="$withval",SS_TQTLIB_NAME="qt")
AC_MSG_RESULT("$SS_TQTLIB_NAME")
])
AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
@ -1701,24 +1701,24 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"
ss_qt_libs_to_find="lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.a"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.a"
ss_qt_libs_to_find="lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.a"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME.a"
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT3_LIBDIR)
@ -1746,7 +1746,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT4_LIBDIR)
SS_QT3_LIBDIR="$SS_QT4_LIBDIR"
SS_QTLIB_NAME="tqt"
SS_TQTLIB_NAME="tqt"
AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_LIBDIR])
dnl AC_MSG_RESULT([FAILED])
@ -1926,22 +1926,22 @@ AC_DEFUN([AC_SS_FIND_QT3_MT],
AC_MSG_CHECKING([for the multithreaded version of Qt])
if test "$SS_QT3_NOMT" = "NOTGIVEN"; then
ss_qt_libs_to_find="lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.a"
ss_qt_libs_to_find="lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_TQTLIB_NAME-mt.a"
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$SS_QT3_LIBDIR,SS_QTMTLIBDIR)
if test "$SS_QTMTLIBDIR" = "FAILED"; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([seems to be available])
SS_QTLIB_NAME="$SS_QTLIB_NAME-mt"
SS_TQTLIB_NAME="$SS_TQTLIB_NAME-mt"
fi
else
AC_MSG_RESULT([disabled by user])
@ -1969,7 +1969,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
else
LIBS=""
fi
LIBS="$LIBS -L$SS_QT3_LIBDIR -l$SS_QTLIB_NAME"
LIBS="$LIBS -L$SS_QT3_LIBDIR -l$SS_TQTLIB_NAME"
if test -n "$SS_X_LDFLAGS"; then
LIBS="$LIBS $SS_X_LDFLAGS"
fi
@ -2303,7 +2303,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
if test -n "$SS_X_LIBLINK"; then
LIBS="$LIBS $SS_X_LIBLINK"
fi
LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -ltdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -ltdecore -l$SS_TQTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
fi
@ -2483,7 +2483,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
fi
if test "$SS_USE_QT4" = "no"; then
SS_LIBLINK="-l$SS_QTLIB_NAME"
SS_LIBLINK="-l$SS_TQTLIB_NAME"
else
#if test -n "SS_LOCAL_ADD_DEBUG_SYMBOLS"; then
# SS_LIBLINK="-lQtCore_debug -lQtGui_debug -lQt3Support_debug"

30
doc/INSTALL-MacOS.txt
Unescape View File

@ -102,9 +102,9 @@ Feel free to remove --enable-debug if you don't want to have a debuggable build
3) Run make
CAUTION!!! Because of a problem with libtool you have to remove or rename the file libqt-mt.la (or libqt.la if you compiled QT without threads). It is located in $QTDIR/lib/. Otherwise the compilation will stop with a link error.
CAUTION!!! Because of a problem with libtool you have to remove or rename the file libtqt-mt.la (or libtqt.la if you compiled QT without threads). It is located in $QTDIR/lib/. Otherwise the compilation will stop with a link error.
# mv $QTDIR/lib/libqt-mt.la $QTDIR/lib/libqt-mt.la.bak
# mv $QTDIR/lib/libtqt-mt.la $QTDIR/lib/libtqt-mt.la.bak
Now run make and relax :-)
@ -120,7 +120,7 @@ Now run make and relax :-)
5) Relinking
KVirc and its modules depend on libkvilib and libqt which are not in the dynamic linker search path by default. The paths set during the compilation are absolute paths and have to be changed to be realtive to the executable path.
KVirc and its modules depend on libkvilib and libtqt which are not in the dynamic linker search path by default. The paths set during the compilation are absolute paths and have to be changed to be realtive to the executable path.
The following commands do this for libkvilib:
@ -128,29 +128,29 @@ The following commands do this for libkvilib:
# install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib @executable_path/../Frameworks/libkvilib.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc
# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib @executable_path/../Frameworks/libkvilib.3.dylib
Now you have to decide whether you want to include libqt within the bundle or not. This is useful if you consider to share your bundle with your friends and they don't want to compile QT themselves.
Now you have to decide whether you want to include libtqt within the bundle or not. This is useful if you consider to share your bundle with your friends and they don't want to compile QT themselves.
a) You don't want to include libqt within the bundle
a) You don't want to include libtqt within the bundle
Make sure the dynamic linker is able to find libqt. The easiest way is to make symlinks in the /usr/lib directory.
Make sure the dynamic linker is able to find libtqt. The easiest way is to make symlinks in the /usr/lib directory.
# ln -sf $QTDIR/lib/libqt-mt.3.dylib /usr/lib
# ln -sf $QTDIR/lib/libtqt-mt.3.dylib /usr/lib
# ln -sf $QTDIR/lib/libqui.1.dylib /usr/lib
b) You want to include libqt within the bundle
b) You want to include libtqt within the bundle
Copy libqt into the bundle:
Copy libtqt into the bundle:
# cp $QTDIR/lib/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/
# cp $QTDIR/lib/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/
Relinking commands for libqt:
Relinking commands for libtqt:
# install_name_tool -id @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libqt-mt.3.dylib
# install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc
# install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib
# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change libqt-mt.3.dylib @executable_path/../Frameworks/libqt-mt.3.dylib
# install_name_tool -id @executable_path/../Frameworks/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libtqt-mt.3.dylib
# install_name_tool -change libtqt-mt.3.dylib @executable_path/../Frameworks/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/MacOS/kvirc
# install_name_tool -change libtqt-mt.3.dylib @executable_path/../Frameworks/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/libkvilib.3.dylib
# find $(pwd)/KVirc.app/Contents -name '*.so' | xargs -n1 install_name_tool -change libtqt-mt.3.dylib @executable_path/../Frameworks/libtqt-mt.3.dylib
6) Cleaning up

Write Preview
Loading…
Cancel
Save