Browse Source

qt -> tqt conversion:

QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 11 months ago
parent
commit
4177b104fd
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 30 additions and 30 deletions
  1. 10
    10
      INSTALL
  2. 12
    12
      acinclude.m4
  3. 7
    7
      doc/INSTALL-MacOS.txt
  4. 1
    1
      doc/win32.compiling.1.2.txt

+ 10
- 10
INSTALL 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 tqtlibrary path"
# export TQTDIR="your tqtlibrary path"

eventually:

@@ -259,16 +259,16 @@ General notes for the installation of the 3.4.0 release of KVIrc
script tries to be smart , but in some cases it will fail.

So before running the script make sure that the enviroinement
variable $QTDIR points to the right location. This will help
variable $TQTDIR points to the right location. This will help
in finding the correct version of Qt.
You might eventually set it with the command:

# export QTDIR="your qt dir"
# export TQTDIR="your qt dir"

On my system qt is installed in /usr/local/kde/qt
so I actually execute

# export QTDIR="/usr/local/kde/qt"
# export TQTDIR="/usr/local/kde/qt"

If you want to compile the KDE support you might want to do the same
with TDEDIR
@@ -303,7 +303,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
Look for the qt library in <DIR>.
You might want to use this if the configure script has trouble
in finding the qt library.
You should have no problems if you use export QTDIR="<DIR>"
You should have no problems if you use export TQTDIR="<DIR>"
before launching the configure script, but it might help you
if you have a non standard Qt installation.
@@ -311,15 +311,15 @@ General notes for the installation of the 3.4.0 release of KVIrc
Look for the qt headers in <DIR>.
You might want to use this if the configure script has trouble
in finding the qt headers. It may especially help if your headers
are in a place different than $QTDIR/include (and thus you have
are in a place different than $TQTDIR/include (and thus you have
a non standard installation)
--with-qt-moc=<PATH>
Use the qt meta-object compiler found in <PATH>
The path is usually $QTDIR/bin/moc , and the
The path is usually $TQTDIR/bin/moc , and the
configure script will find it if you have a standard
Qt installation and $QTDIR points to the right directory.
Thus should have no problems if you use export QTDIR="<DIR>"
Qt installation and $TQTDIR points to the right directory.
Thus should have no problems if you use export TQTDIR="<DIR>"
before launching the configure script, but it might help you
if you have a non standard Qt installation.
This will also help if you have the moc compiler renamed
@@ -709,7 +709,7 @@ General notes for the installation of the 3.4.0 release of KVIrc

6. switch to a console

7. export QTDIR=[path] On Debian is '/usr'
7. export TQTDIR=[path] On Debian is '/usr'

8. Read http://doc.trolltech.com/3.0/envvars.html and configure your
environment vars until kvirc3-emb loads (it will give you an error

+ 12
- 12
acinclude.m4 View File

@@ -1502,8 +1502,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
ss_qt_general_test_dirs="$ss_qt_general_test_dirs $HOME $HOME/lib"
fi

if test -n "$QTDIR"; then
ss_qt_general_test_dirs="$QTDIR $ss_qt_general_test_dirs"
if test -n "$TQTDIR"; then
ss_qt_general_test_dirs="$TQTDIR $ss_qt_general_test_dirs"
fi

ss_qt_general_test_path_suffix="qt$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
@@ -1547,8 +1547,8 @@ AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR],
ss_qt_general_test_dirs="$ss_qt_general_test_dirs $HOME $HOME/lib"
fi

if test -n "$QTDIR"; then
ss_qt_general_test_dirs="$QTDIR $ss_qt_general_test_dirs"
if test -n "$TQTDIR"; then
ss_qt_general_test_dirs="$TQTDIR $ss_qt_general_test_dirs"
fi

ss_qt_general_test_path_suffix="qt$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED"
@@ -1585,7 +1585,7 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
AC_MSG_CHECKING([for the Qt 3.x header files])

ss_qt_include_test_dirs="$SS_QT3_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/tqt3 /usr/include/qt3 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT3_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
@@ -1602,7 +1602,7 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
dnl HACK HACK HACK

ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
@@ -1652,7 +1652,7 @@ AC_DEFUN([AC_SS_FIND_QT4_INCLUDE_DIR],
AC_MSG_CHECKING([for the Qt 4.x header files])

ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
@@ -1698,7 +1698,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
AC_MSG_CHECKING([for the Qt library])

ss_qt_library_test_dirs="$SS_QT3_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $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_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
@@ -1729,7 +1729,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
AC_MSG_CHECKING([for the Qt 4.x libraries])

ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $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_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib"
@@ -1784,7 +1784,7 @@ AC_DEFUN([AC_SS_FIND_QT4_LIBRARY_DIR],
AC_MSG_CHECKING([for the Qt 4.x libraries])

ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $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_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib"
@@ -1837,7 +1837,7 @@ AC_DEFUN([AC_SS_FIND_QT3_MOC],
AC_MSG_CHECKING([for the Qt 3.x tmoc])

unset SS_QT3_MOC
ss_moc_test_dirs="$QTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
ss_moc_test_dirs="$TQTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
if test -n "$SS_QT3_GENERAL_DIR"; then
ss_moc_test_dirs="$SS_QT3_GENERAL_DIR/bin $ss_moc_test_dirs"
fi
@@ -1881,7 +1881,7 @@ AC_DEFUN([AC_SS_FIND_QT4_MOC],
AC_MSG_CHECKING([for the Qt 4.x moc])

unset SS_QT4_MOC
ss_moc_test_dirs="$QTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
ss_moc_test_dirs="$TQTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
if test -n "$SS_QT4_GENERAL_DIR"; then
ss_moc_test_dirs="$SS_QT4_GENERAL_DIR/bin $ss_moc_test_dirs"
fi

+ 7
- 7
doc/INSTALL-MacOS.txt View File

@@ -45,8 +45,8 @@ I used V3.3.4

Add the following two lines to your ~/.profile file, otherwise the compilation if Qt may fail.

export QTDIR=/Developer/qt-mac-free-3.3.4
export DYLD_FALLBACK_LIBRARY_PATH=$QTDIR/lib
export TQTDIR=/Developer/qt-mac-free-3.3.4
export DYLD_FALLBACK_LIBRARY_PATH=$TQTDIR/lib


Open a terminal window
@@ -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 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.
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 $TQTDIR/lib/. Otherwise the compilation will stop with a link error.

# mv $QTDIR/lib/libtqt-mt.la $QTDIR/lib/libtqt-mt.la.bak
# mv $TQTDIR/lib/libtqt-mt.la $TQTDIR/lib/libtqt-mt.la.bak

Now run make and relax :-)

@@ -135,15 +135,15 @@ a) You don't want to include libtqt within the bundle

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/libtqt-mt.3.dylib /usr/lib
# ln -sf $QTDIR/lib/libqui.1.dylib /usr/lib
# ln -sf $TQTDIR/lib/libtqt-mt.3.dylib /usr/lib
# ln -sf $TQTDIR/lib/libqui.1.dylib /usr/lib


b) You want to include libtqt within the bundle

Copy libtqt into the bundle:

# cp $QTDIR/lib/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/
# cp $TQTDIR/lib/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/

Relinking commands for libtqt:


+ 1
- 1
doc/win32.compiling.1.2.txt View File

@@ -159,7 +159,7 @@ and/or extract the ready-to-use pakage wherever you may like (generally in folde
Now we need to set up every variable of this ambiency, needed in order the compiler
will be able to find every library from which KVIrc depends.
Right-button on Resources then Properties -> Advanced -> Ambient Variables and this will
engage all QT system variables (QTDIR) set; if that doesn't match you will need to
engage all QT system variables (TQTDIR) set; if that doesn't match you will need to
reinstall QT and remember to answer YES once you're prompted for setting all ambiency
variables, otherwise you will need to set them manually – that parts from this tutorial.


Loading…
Cancel
Save