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

qt -> tqt conversion:

Browse Source 
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 6 years ago
parent e5650b540c
commit bcbc4cad35
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

14
README
Unescape View File

@ -71,9 +71,9 @@ Requirements & Installation:
- tdelibs-devel - tdelibs-devel
Installation for KDE3: 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 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 - cd into the directory kdiff3-0.9.91 and type
- ./configure --prefix=/opt/trinity (your KDE3 directory here) - ./configure --prefix=/opt/trinity (your KDE3 directory here)
- (make clean) (Required if you already compiled once.) - (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: Installation for the Qt-only-platforms for Un*x:
(for Qt >=3.3.0 but <4.0) (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 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 - cd into the directory kdiff3-0.9.91/src and type
- make -f Makefile.qt - make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.) - 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 If you want to build the Qt-only version _and_ the KDE-version, do this
in separate directories, otherwise there will be errors. 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 - 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: Build for Windows:
@ -226,7 +226,7 @@ Note for KDE-users:
normal version 0.9.91. normal version 0.9.91.
Build-instructions (Unix or Mac): 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. your path contains the Qt4-bin-directory.
- cd into the directory kdiff3-0.9.91/src-QT4 and type - cd into the directory kdiff3-0.9.91/src-QT4 and type
- qmake kdiff3.pro - qmake kdiff3.pro
@ -234,7 +234,7 @@ Build-instructions (Unix or Mac):
Build-instructions (Windows): Build-instructions (Windows):
- Run your qtvars.bat in the Qt4-bin directory. - 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 - cd into the directory kdiff3-0.9.91/src-Qt4 and type
- qmake kdiff3.pro - qmake kdiff3.pro
- make (which calls either "mingw32-make" or "nmake") - make (which calls either "mingw32-make" or "nmake")

18
acinclude.m4
Unescape View File

@ -296,7 +296,7 @@ EOT
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl Find the meta object compiler and the ui compiler in the PATH, 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 ------------------------------------------------------------------------
dnl dnl
AC_DEFUN([AC_PATH_TQT_MOC_UIC], AC_DEFUN([AC_PATH_TQT_MOC_UIC],
@ -1223,16 +1223,16 @@ else
fi fi
if test $kde_qtver = 4; then 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 fi
if test $kde_qtver = 3; then 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 fi
if test $kde_qtver = 2; then 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 fi
if test $kde_qtver = 1; then if test $kde_qtver = 1; then
kde_qt_dirs="$QTDIR /usr/lib/qt" kde_qt_dirs="$TQTDIR /usr/lib/qt"
fi fi
]) ])
@ -5534,10 +5534,10 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir" kde_qtdir="$with_qt_dir"
fi 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_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($QTDOCDIR) AC_MSG_RESULT($TQTDOCDIR)
AC_SUBST(QTDOCDIR) AC_SUBST(TQTDOCDIR)
KDE_FIND_PATH(dot, DOT, [], []) KDE_FIND_PATH(dot, DOT, [], [])
if test -n "$DOT"; then if test -n "$DOT"; then
@ -5555,7 +5555,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER) AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no 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 KDE_HAS_DOXYGEN=yes
fi fi
AC_SUBST(KDE_HAS_DOXYGEN) AC_SUBST(KDE_HAS_DOXYGEN)

2
kdiff3.spec
Unescape View File

@ -27,7 +27,7 @@ Unicode & UTF-8 support
%setup %setup
%build %build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh [ -n "$TQTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
export TDEDIR=%{_prefix} export TDEDIR=%{_prefix}

6
po/README
Unescape View File

@ -81,12 +81,12 @@ This was the explanation for translations within KDE.
But KDiff3 can also be compiled and run without 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 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 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: 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 For KDE-libs in the SVN-repository, where we can reuse the previous trick to get
all tdelibs*.po-files: 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 msgcat --use-first de.po kreplacements_de.po >kdiff3_de.po
4. Finally create the fast lookup table: 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. 5. The intermediate files can then be deleted.

10
src/Makefile.qt
Unescape View File

@ -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 CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
LEXFLAGS = LEXFLAGS =
YACCFLAGS= -d 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++ LINK = g++
LFLAGS = 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 AR = ar cqs
RANLIB = RANLIB =
MOC = $(QTDIR)/bin/moc MOC = $(TQTDIR)/bin/moc
UIC = $(QTDIR)/bin/uic UIC = $(TQTDIR)/bin/uic
QMAKE = qmake QMAKE = qmake
TAR = tar -cf TAR = tar -cf
GZIP = gzip -9f GZIP = gzip -9f
@ -155,7 +155,7 @@ mocables: $(SRCMOC)
uicables: $(UICDECLS) $(UICIMPLS) uicables: $(UICDECLS) $(UICIMPLS)
$(MOC): $(MOC):
( cd $(QTDIR)/src/moc && $(MAKE) ) ( cd $(TQTDIR)/src/moc && $(MAKE) )
dist: 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 @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

Write Preview
Loading…
Cancel
Save