summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:04:15 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:04:15 +0900
commitbcbc4cad354c554b4c240a50a0828c2f54819245 (patch)
tree5880d55f25ced8addec297ea2af17265f61e260e
parente5650b540c7a5f17a0147aed0d8ad71bdffca41f (diff)
downloadkdiff3-bcbc4cad354c554b4c240a50a0828c2f54819245.tar.gz
kdiff3-bcbc4cad354c554b4c240a50a0828c2f54819245.zip
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>
-rw-r--r--README14
-rw-r--r--acinclude.m418
-rw-r--r--kdiff3.spec2
-rw-r--r--po/README6
-rw-r--r--src/Makefile.qt10
5 files changed, 25 insertions, 25 deletions
diff --git a/README b/README
index e6ddc8c..9ece7b7 100644
--- a/README
+++ b/README
@@ -71,9 +71,9 @@ Requirements & Installation:
- tdelibs-devel
Installation for KDE3:
- - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
+ - Make sure your shell-variable TQTDIR is correct. (echo $TQTDIR).
If it doesn't contain the correct path, type
- export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
+ export TQTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- cd into the directory kdiff3-0.9.91 and type
- ./configure --prefix=/opt/trinity (your KDE3 directory here)
- (make clean) (Required if you already compiled once.)
@@ -137,9 +137,9 @@ Building an RPM for Fedora Core (by Vadim Likhota)
Installation for the Qt-only-platforms for Un*x:
(for Qt >=3.3.0 but <4.0)
- - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
+ - Make sure your shell-variable TQTDIR is correct. (echo $TQTDIR).
If it doesn't contain the correct path, type
- export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
+ export TQTDIR=your_path_to_qt (e.g. /usr/lib/qt)
- cd into the directory kdiff3-0.9.91/src and type
- make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.)
@@ -149,7 +149,7 @@ Installation for the Qt-only-platforms for Un*x:
If you want to build the Qt-only version _and_ the KDE-version, do this
in separate directories, otherwise there will be errors.
- A user reported that on his 64-bit machine running FC4 he had to edit his Makefile.qt
- LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/lib -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread
+ LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(TQTDIR)/lib64/ -L/usr/lib -L$(TQTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread
Build for Windows:
@@ -226,7 +226,7 @@ Note for KDE-users:
normal version 0.9.91.
Build-instructions (Unix or Mac):
- - Make sure your shell-variable QTDIR is correct and that
+ - Make sure your shell-variable TQTDIR is correct and that
your path contains the Qt4-bin-directory.
- cd into the directory kdiff3-0.9.91/src-QT4 and type
- qmake kdiff3.pro
@@ -234,7 +234,7 @@ Build-instructions (Unix or Mac):
Build-instructions (Windows):
- Run your qtvars.bat in the Qt4-bin directory.
- (This should set your QTDIR, QMAKESPEC and PATH-environment-variables.)
+ (This should set your TQTDIR, QMAKESPEC and PATH-environment-variables.)
- cd into the directory kdiff3-0.9.91/src-Qt4 and type
- qmake kdiff3.pro
- make (which calls either "mingw32-make" or "nmake")
diff --git a/acinclude.m4 b/acinclude.m4
index 23a8fa7..3f222ab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -296,7 +296,7 @@ EOT
dnl ------------------------------------------------------------------------
dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
+dnl in $TQTDIR/bin, and some more usual places
dnl ------------------------------------------------------------------------
dnl
AC_DEFUN([AC_PATH_TQT_MOC_UIC],
@@ -1223,16 +1223,16 @@ else
fi
if test $kde_qtver = 4; then
- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
+ kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
fi
if test $kde_qtver = 2; then
- kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
+ kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt"
fi
if test $kde_qtver = 1; then
- kde_qt_dirs="$QTDIR /usr/lib/qt"
+ kde_qt_dirs="$TQTDIR /usr/lib/qt"
fi
])
@@ -5534,10 +5534,10 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-AC_MSG_RESULT($QTDOCDIR)
+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR)
+AC_MSG_RESULT($TQTDOCDIR)
-AC_SUBST(QTDOCDIR)
+AC_SUBST(TQTDOCDIR)
KDE_FIND_PATH(dot, DOT, [], [])
if test -n "$DOT"; then
@@ -5555,7 +5555,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)
diff --git a/kdiff3.spec b/kdiff3.spec
index fdde0a6..839b193 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -27,7 +27,7 @@ Unicode & UTF-8 support
%setup
%build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+[ -n "$TQTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
export TDEDIR=%{_prefix}
diff --git a/po/README b/po/README
index 771b254..7a55918 100644
--- a/po/README
+++ b/po/README
@@ -81,12 +81,12 @@ This was the explanation for translations within KDE.
But KDiff3 can also be compiled and run without KDE:
Since Qt was used for KDiff3, the first part is quite the same: Only the fast lookup-table
-(*.qm-files) must be created with $QTDIR/bin/msg2tqm (instead of msgfmt). ($QTDIR/tools/msg2tqm)
+(*.qm-files) must be created with $TQTDIR/bin/msg2tqm (instead of msgfmt). ($TQTDIR/tools/msg2tqm)
Still one detail isn't right: Some strings are not translated, because under KDE their
translation is within KDE-libs or within Qt. But the translations are available:
-For Qt-strings in $QTDIR/translations (already as .qm-files)
+For Qt-strings in $TQTDIR/translations (already as .qm-files)
For KDE-libs in the SVN-repository, where we can reuse the previous trick to get
all tdelibs*.po-files:
@@ -126,7 +126,7 @@ about how to extract only the needed strings and to create the qm-files.
msgcat --use-first de.po kreplacements_de.po >kdiff3_de.po
4. Finally create the fast lookup table:
- $QTDIR/bin/msg2tqm kdiff3_de.po kdiff3_de.qm
+ $TQTDIR/bin/msg2tqm kdiff3_de.po kdiff3_de.qm
5. The intermediate files can then be deleted.
diff --git a/src/Makefile.qt b/src/Makefile.qt
index 5747420..1aaecff 100644
--- a/src/Makefile.qt
+++ b/src/Makefile.qt
@@ -16,14 +16,14 @@ CFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUP
CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include
+INCPATH = -I$(TQTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(TQTDIR)/include
LINK = g++
LFLAGS =
-LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lXext -lX11 -lm -lpthread
+LIBS = $(SUBLIBS) -L/usr/lib/ -L$(TQTDIR)/lib/ -L/usr/X11R6/lib/ -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
-MOC = $(QTDIR)/bin/moc
-UIC = $(QTDIR)/bin/uic
+MOC = $(TQTDIR)/bin/moc
+UIC = $(TQTDIR)/bin/uic
QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
@@ -155,7 +155,7 @@ mocables: $(SRCMOC)
uicables: $(UICDECLS) $(UICIMPLS)
$(MOC):
- ( cd $(QTDIR)/src/moc && $(MAKE) )
+ ( cd $(TQTDIR)/src/moc && $(MAKE) )
dist:
@mkdir -p .tmp/kdiff3 && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/kdiff3/ && ( cd `dirname .tmp/kdiff3` && $(TAR) kdiff3.tar kdiff3 && $(GZIP) kdiff3.tar ) && $(MOVE) `dirname .tmp/kdiff3`/kdiff3.tar.gz . && $(DEL_FILE) -r .tmp/kdiff3