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/4/head
Michele Calgaro 10 months ago
parent
commit
2518c29202
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 5
- 5
COMPILING.html View File

@@ -47,13 +47,13 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
<p>On systems that respond to environment variables something similar to the
following is appropriate:

<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib
<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$TQTDIR/lib

<p>On systems whose diety of choice is ldconfig, try:
<pre>ldconfig -m $TDEDIR/lib
ldconfig -m $QTDIR/lib</pre>
ldconfig -m $TQTDIR/lib</pre>

<p>You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.
<p>You probably also want to add $TDEDIR/bin and $TQTDIR/bin to your path.

<p>See http://www.kde.org/kde2-and-trinity.html for tips about setting up
KDE 3.0 next to KDE 2.x.
@@ -92,7 +92,7 @@ make</pre>
especially if your system has more version of Qt installed. Be aware
that information about library paths gets saved in the "config.cache"
file, "Makefile.in" as well as "Makefile" files. So it can be that after
some struggle to get QTDIR/TDEDIR setup correctly your setup is actually
some struggle to get TQTDIR/TDEDIR setup correctly your setup is actually
correct, but old -incorrect- settings are still lying around.

<p>The best thing to do in such a case is to do a "make cvs-clean". This
@@ -109,7 +109,7 @@ files lying around in your source tree any more, they will be deleted!
Do a "make cvs-clean" and start from scratch, usually this solves the problem.

<p>If you encounter missing include files, especially if the files start with
a 'q', you probably have not setup your QTDIR correct or have the wrong
a 'q', you probably have not setup your TQTDIR correct or have the wrong
version of Qt.

<p>If you encounter compile errors after updating from CVS, check whether you

+ 2
- 2
Makefile.am.in View File

@@ -71,7 +71,7 @@ dist-hook:
cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin

# Rule for generating HTML documentation [you need kdoc installed]
# Don't forget to run qt2kdoc first (qt2kdoc $QTDIR/doc/html)
# Don't forget to run qt2kdoc first (qt2kdoc $TQTDIR/doc/html)
# The tdelibs docu will end up in ./srcdoc/
kdedoc:
cd $(top_srcdir) && \
@@ -101,7 +101,7 @@ apidox-am-toplevel-tdelibs: $(top_builddir)/apidocs/qt/qt.tag
$(top_builddir)/apidocs/qt/qt.tag:
@echo "*** Creating a tag file for the Qt library:"; \
$(mkinstalldirs) $(top_builddir)/apidocs/qt; \
doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR)
doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(TQTDOCDIR)

install-data-local: install-apidox-tdelibs


+ 1
- 1
dcop/HOWTO View File

@@ -503,7 +503,7 @@ int main(int argc, char **argv)

Compiled with:

g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore
g++ -O2 -o testit testit.cpp -I$TQTDIR/include -L$TQTDIR/lib -ltdecore

on Linux yields the following memory use statistics:


+ 2
- 2
dcop/testdcop.h View File

@@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#include <stdio.h>
/**
$QTDIR/bin/moc testdcop.cpp -o testdcop.moc
g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib
$TQTDIR/bin/moc testdcop.cpp -o testdcop.moc
g++ -o testdcop testdcop.cpp -I$TQTDIR/include -L$TQTDIR/lib
@internal

**/

+ 4
- 4
doc/common/README.Doxygen View File

@@ -85,12 +85,12 @@ Differences with current dox: <TODO>
# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib
#
# When generating dox for tdelibs, a tag file for Qt is also created.
# The location of Qt is specified indirectly through $QTDOCDIR or,
# if that is not set, $QTDIR, or otherwise guessed. You may explicitly
# set the location of a pre-generated tag file with $QTDOCTAG. One
# The location of Qt is specified indirectly through $TQTDOCDIR or,
# if that is not set, $TQTDIR, or otherwise guessed. You may explicitly
# set the location of a pre-generated tag file with $TQTDOCTAG. One
# typical approach might be:
#
# QTDOCTAG=$QTDIR/doc/qt.tag QTDOCDIR=http://doc.trolltech.com/3.3/
# TQTDOCTAG=$TQTDIR/doc/qt.tag TQTDOCDIR=http://doc.trolltech.com/3.3/
#
# Finally, there is a --no-recurse option for top-level generation
# that avoids generating all the subdirectories as well. It also

+ 3
- 3
tdeio/tests/kurifiltertest.cpp View File

@@ -288,14 +288,14 @@ int main(int argc, char **argv)
setenv( "SOMEVAR", "/somevar", 0 );
setenv( "ETC", "/etc", 0 );

TQCString qtdir=getenv("QTDIR");
TQCString qtdir=getenv("TQTDIR");
TQCString home = getenv("HOME");
TQCString tdehome = getenv("TDEHOME");

filter( "$SOMEVAR/tdelibs/tdeio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
if( !qtdir.isEmpty() ) {
filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
filter( "$TQTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
}
filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion

@@ -336,7 +336,7 @@ int main(int argc, char **argv)
// itself if the requested environment variable
// is not already set.
if( !qtdir.isEmpty() ) {
filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
filter( "$TQTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
}
filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.


+ 1
- 1
tdeprint/tests/main.cpp View File

@@ -23,7 +23,7 @@ int main( int argc, char ** argv )
if (argc > 1)
home = argv[1];
else
home = TQString(getenv("QTDIR")) + "/doc/html/index.html";
home = TQString(getenv("TQTDIR")) + "/doc/html/index.html";

HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");

+ 1
- 1
win/tools/build_tdelibs_dbg View File

@@ -73,7 +73,7 @@ qmake maketdewidgets.pro && $make clean && $make || exit 1
qmake && $make clean && $make || exit 1

# copy tdewidgets plugin for Qt Designer
cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $QTDIR/plugins/designer/
cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $TQTDIR/plugins/designer/

cd $pwd


+ 1
- 1
win/zlib.pro View File

@@ -6,5 +6,5 @@ exists( $(KDELIBS)/win/3rdparty/zlib/zlib.h ) {
LIBS += $$KDELIBDESTDIR\zdll.lib
}
!exists( $(KDELIBS)/win/3rdparty/zlib/zlib.h ) {
INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
INCLUDEPATH += $(TQTDIR)/src/3rdparty/zlib
}

Loading…
Cancel
Save