diff --git a/.gitignore b/.gitignore index cdb998c8..581a73bf 100644 --- a/.gitignore +++ b/.gitignore @@ -86,7 +86,7 @@ Makefile /examples/network/ftpclient/ftpclient /examples/network/ftpclient/ftpmainwindow.cpp /examples/network/ftpclient/ftpmainwindow.h -/examples/network/ftpclient/qmake_image_collection.cpp +/examples/network/ftpclient/tqmake_image_collection.cpp /examples/network/httpd/httpd /examples/network/infoprotocol/infoclient/clientbase.cpp /examples/network/infoprotocol/infoclient/clientbase.h @@ -165,7 +165,7 @@ Makefile /examples/tablet/tabletstatsbase.cpp /examples/tablet/tabletstatsbase.h /examples/tetrix/tetrix -/examples/textedit/qmake_image_collection.cpp +/examples/textedit/tqmake_image_collection.cpp /examples/textedit/textedit /examples/themes/themes /examples/thread/prodcons/prodcons @@ -190,7 +190,7 @@ Makefile /plugins/inputmethods/ /plugins/sqldrivers/ /plugins/styles/ -/qmake/tqmake +/tqmake/tqmake /src/tools/tqconfig.cpp /tools/assistant/finddialog.cpp /tools/assistant/finddialog.h @@ -198,7 +198,7 @@ Makefile /tools/assistant/helpdialog.h /tools/assistant/mainwindow.cpp /tools/assistant/mainwindow.h -/tools/assistant/qmake_image_collection.cpp +/tools/assistant/tqmake_image_collection.cpp /tools/assistant/settingsdialog.cpp /tools/assistant/settingsdialog.h /tools/assistant/tabbedbrowser.cpp @@ -258,7 +258,7 @@ Makefile /tools/designer/designer/previewwidget.h /tools/designer/designer/projectsettings.cpp /tools/designer/designer/projectsettings.h -/tools/designer/designer/qmake_image_collection.cpp +/tools/designer/designer/tqmake_image_collection.cpp /tools/designer/designer/replacedialog.cpp /tools/designer/designer/replacedialog.h /tools/designer/designer/richtextfontdialog.cpp @@ -280,13 +280,13 @@ Makefile /tools/designer/plugins/cppeditor/projectsettings.h /tools/designer/plugins/wizards/mainwindowwizard.cpp /tools/designer/plugins/wizards/mainwindowwizard.h -/tools/designer/plugins/wizards/qmake_image_collection.cpp +/tools/designer/plugins/wizards/tqmake_image_collection.cpp /tools/designer/plugins/wizards/sqlformwizard.cpp /tools/designer/plugins/wizards/sqlformwizard.h /tools/designer/tools/tqtcreatecw/tqtcreatecw /tools/linguist/linguist/about.cpp /tools/linguist/linguist/about.h -/tools/linguist/linguist/qmake_image_collection.cpp +/tools/linguist/linguist/tqmake_image_collection.cpp /tools/linguist/linguist/statistics.cpp /tools/linguist/linguist/statistics.h /tools/linguist/linguist/tqlinguist.png @@ -302,6 +302,6 @@ Makefile /tools/qtconfig/paletteeditoradvancedbase.h /tools/qtconfig/previewwidgetbase.cpp /tools/qtconfig/previewwidgetbase.h -/tools/qtconfig/qmake_image_collection.cpp +/tools/qtconfig/tqmake_image_collection.cpp /tools/qtconfig/tqtconfig.png /tools/tqtmergetr/tqtmergetr diff --git a/MANIFEST b/MANIFEST index c000748d..25c72ab1 100644 --- a/MANIFEST +++ b/MANIFEST @@ -15,7 +15,7 @@ include TQt include files lib Place for the TQt libraries mkspecs Platform/compiler configuration files plugins TQt plugins -qmake TQt build system +tqmake TQt build system src TQt library source code tools TQt tools source code tutorial TQt tutorial source code diff --git a/Makefile b/Makefile index ce6f2f7e..bdfaa062 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ uninstall: FORCE install: FORCE @$(MAKE) qt.install -all: symlinks src-qmake src-tqmoc sub-src sub-tools sub-tutorial sub-examples +all: symlinks src-tqmake src-tqmoc sub-src sub-tools sub-tutorial sub-examples @echo @echo "The TQt library is now built in ./lib" @echo "The TQt examples are built in the directories in ./examples" @@ -20,35 +20,35 @@ all: symlinks src-qmake src-tqmoc sub-src sub-tools sub-tutorial sub-examples @echo "Enjoy! - the Trolltech team" @echo -qt.install: qmake-install tqmoc-install src-install tools-install plugins-install -qt.uninstall: qmake-uninstall tqmoc-uninstall src-uninstall tools-uninstall plugins-uninstall +qt.install: tqmake-install tqmoc-install src-install tools-install plugins-install +qt.uninstall: tqmake-uninstall tqmoc-uninstall src-uninstall tools-uninstall plugins-uninstall #tqmoc -tqmoc-uninstall: .qmake.cache +tqmoc-uninstall: .tqmake.cache cd src/tqmoc && $(MAKE) uninstall tqmoc-install: src-tqmoc cd src/tqmoc && $(MAKE) install -src-tqmoc: src-qmake FORCE +src-tqmoc: src-tqmake FORCE cd src/tqmoc && $(MAKE) #Qt -src-uninstall: .qmake.cache +src-uninstall: .tqmake.cache cd src && $(MAKE) uninstall src-install: sub-src cd src && $(MAKE) install -sub-src: src-tqmoc .qmake.cache FORCE +sub-src: src-tqmoc .tqmake.cache FORCE cd src && $(MAKE) -#qmake -qmake-uninstall: .qmake.cache - cd qmake && $(MAKE) uninstall -qmake-install: src-qmake - cd qmake && $(MAKE) install -src-qmake: symlinks FORCE - cd qmake && $(MAKE) +#tqmake +tqmake-uninstall: .tqmake.cache + cd tqmake && $(MAKE) uninstall +tqmake-install: src-tqmake + cd tqmake && $(MAKE) install +src-tqmake: symlinks FORCE + cd tqmake && $(MAKE) #tools -tools-uninstall: .qmake.cache +tools-uninstall: .tqmake.cache cd tools && $(MAKE) uninstall tools-install: sub-tools cd tools && $(MAKE) install @@ -56,11 +56,11 @@ sub-tools: sub-plugins FORCE cd tools && $(MAKE) #plugins -plugins-uninstall: .qmake.cache +plugins-uninstall: .tqmake.cache cd plugins/src && $(MAKE) uninstall plugins-install: sub-plugins cd plugins/src && $(MAKE) install -sub-plugins: sub-src .qmake.cache FORCE +sub-plugins: sub-src .tqmake.cache FORCE cd plugins/src && $(MAKE) #tutorials @@ -75,7 +75,7 @@ sub-examples: sub-tools FORCE doc: FORCE qdoc util/qdoc/qdoc.conf -symlinks: .qmake.cache +symlinks: .tqmake.cache # @cd include && rm -f q*.h; ln -s ../src/*/q*.h .; ln -s ../extensions/*/src/q*.h .; rm -f q*_p.h distclean clean uiclean mocclean: @@ -91,9 +91,9 @@ distclean clean uiclean mocclean: cd config.tests/unix/largefile && $(MAKE) distclean cd config.tests/unix/ptrsize && $(MAKE) distclean [ ! -f config.tests/x11/notype/Makefile ] || cd config.tests/x11/notype && $(MAKE) $@ - cd qmake && $(MAKE) $@ + cd tqmake && $(MAKE) $@ -#confclean is actually the same as distclean, except qmake and tqmoc +#confclean is actually the same as distclean, except tqmake and tqmoc #are not cleaned. confclean: cd tools && $(MAKE) distclean @@ -108,7 +108,7 @@ confclean: cd config.tests/unix/ptrsize && $(MAKE) distclean [ ! -f config.tests/x11/notype/Makefile ] || cd config.tests/x11/notype && $(MAKE) distclean -.qmake.cache: +.tqmake.cache: @echo @echo ' TQt must first be configured using the "configure" script.' @echo diff --git a/config.tests/unix/cups.test b/config.tests/unix/cups.test index 55f5aeee..a172d7f7 100755 --- a/config.tests/unix/cups.test +++ b/config.tests/unix/cups.test @@ -2,7 +2,7 @@ CUPS=yes XPLATFORM=`basename $1` -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_INCDIRS="" diff --git a/config.tests/unix/nis.test b/config.tests/unix/nis.test index 21f9f89c..922dca03 100755 --- a/config.tests/unix/nis.test +++ b/config.tests/unix/nis.test @@ -2,7 +2,7 @@ NIS=yes XPLATFORM=`basename $1` -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_INCDIRS="" diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test index 1a553d35..bffc9ccf 100755 --- a/config.tests/unix/precomp.test +++ b/config.tests/unix/precomp.test @@ -2,7 +2,7 @@ PRECOMP_SUPPORT=no XPLATFORM=`basename $1` -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 >precomp_header.h diff --git a/config.tests/x11/opengl.test b/config.tests/x11/opengl.test index 74cd2953..53f3754b 100755 --- a/config.tests/x11/opengl.test +++ b/config.tests/x11/opengl.test @@ -1,7 +1,7 @@ #!/bin/sh OPENGL=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf THREAD=$2 VERBOSE=$3 shift 3 diff --git a/config.tests/x11/sm.test b/config.tests/x11/sm.test index ad99d0e7..36174461 100755 --- a/config.tests/x11/sm.test +++ b/config.tests/x11/sm.test @@ -1,7 +1,7 @@ #!/bin/sh SM=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_INCDIRS="" diff --git a/config.tests/x11/xcursor.test b/config.tests/x11/xcursor.test index 514e33ca..8a2375d5 100755 --- a/config.tests/x11/xcursor.test +++ b/config.tests/x11/xcursor.test @@ -1,7 +1,7 @@ #!/bin/sh XCURSOR=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_LIBDIRS="" diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test index d4cb4ba1..1fb1a9d5 100755 --- a/config.tests/x11/xfreetype.test +++ b/config.tests/x11/xfreetype.test @@ -3,7 +3,7 @@ XFT=yes XFT2=no XFT2_HEADER=no -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 SRCDIR=$3 OUTDIR=$4 diff --git a/config.tests/x11/xinerama.test b/config.tests/x11/xinerama.test index dc015589..962adc2d 100755 --- a/config.tests/x11/xinerama.test +++ b/config.tests/x11/xinerama.test @@ -1,7 +1,7 @@ #!/bin/sh XINERAMA=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_LIBDIRS="" diff --git a/config.tests/x11/xinput.test b/config.tests/x11/xinput.test index c31388bd..d4ea290c 100755 --- a/config.tests/x11/xinput.test +++ b/config.tests/x11/xinput.test @@ -1,7 +1,7 @@ #!/bin/sh XINPUT=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_LIBDIRS="" diff --git a/config.tests/x11/xkb.test b/config.tests/x11/xkb.test index 5560b080..2901adb0 100755 --- a/config.tests/x11/xkb.test +++ b/config.tests/x11/xkb.test @@ -2,7 +2,7 @@ XKB=yes XPLATFORM=`basename $1` -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_INCDIRS="" diff --git a/config.tests/x11/xrandr.test b/config.tests/x11/xrandr.test index 59145a17..1cde8c69 100755 --- a/config.tests/x11/xrandr.test +++ b/config.tests/x11/xrandr.test @@ -1,7 +1,7 @@ #!/bin/sh XRANDR=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_LIBDIRS="" diff --git a/config.tests/x11/xrender.test b/config.tests/x11/xrender.test index 64ccc205..a91b153d 100755 --- a/config.tests/x11/xrender.test +++ b/config.tests/x11/xrender.test @@ -1,7 +1,7 @@ #!/bin/sh XRENDER=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_LIBDIRS="" diff --git a/config.tests/x11/xshape.test b/config.tests/x11/xshape.test index 4fae606d..fd91d067 100755 --- a/config.tests/x11/xshape.test +++ b/config.tests/x11/xshape.test @@ -1,7 +1,7 @@ #!/bin/sh XSHAPE=yes -XCONFIG=$1/qmake.conf +XCONFIG=$1/tqmake.conf VERBOSE=$2 shift 2 IN_LIBDIRS= diff --git a/configure b/configure index 92bdf222..283522d7 100755 --- a/configure +++ b/configure @@ -784,7 +784,7 @@ while [ "$#" -gt 0 ]; do ;; v|verbose) if [ "$VAL" = "yes" ]; then - if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs + if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on tqmake debugs QMAKE_SWITCHES="$QMAKE_SWITCHES -d" else OPT_VERBOSE=yes @@ -928,19 +928,19 @@ WHICH=$unixtests/which.test ### skip this if the user just needs help... if [ "$OPT_HELP" != "yes" ]; then -# create the include and include/qmake directory (for tqconfig.h and tqmodules.h) -[ -d $outpath/include/qmake ] || mkdir -p $outpath/include/qmake +# create the include and include/tqmake directory (for tqconfig.h and tqmodules.h) +[ -d $outpath/include/tqmake ] || mkdir -p $outpath/include/tqmake -# create temporary tqconfig.h for compiling qmake -# when building qmake, we use #defines for the install paths, +# create temporary tqconfig.h for compiling tqmake +# when building tqmake, we use #defines for the install paths, # however they are real functions in the library -cat >>$outpath/include/qmake/tqconfig.h <>$outpath/include/tqmake/tqconfig.h <>$outpath/include/qmake/tqmodules.h <>$outpath/include/tqmake/tqmodules.h </dev/null '^QMAKE_LIBS_THREAD' $XQMAKESPEC/qmake.conf; then +if grep >/dev/null '^QMAKE_LIBS_THREAD' $XQMAKESPEC/tqmake.conf; then AUTOTHREAD=yes else AUTOTHREAD=never fi -# common qmake.conf file but dependency on OS version +# common tqmake.conf file but dependency on OS version if [ "$UNAME_SYSTEM" = "HP-UX" ]; then if echo $UNAME_RELEASE | grep -E "^B\.(09|10)" >/dev/null 2>&1; then AUTOTHREAD=never @@ -1326,15 +1326,15 @@ fi if [ "$UNAME_SYSTEM" = "SunOS" ]; then # Solaris 2.5 and 2.6 have libposix4, which was renamed to librt for Solaris >=7 if echo $UNAME_RELEASE | grep "^5\.[5|6]" >/dev/null 2>&1; then - sed -e "s,-lrt,-lposix4," $XQMAKESPEC/qmake.conf > $XQMAKESPEC/qmake.conf.new - mv $XQMAKESPEC/qmake.conf.new $XQMAKESPEC/qmake.conf + sed -e "s,-lrt,-lposix4," $XQMAKESPEC/tqmake.conf > $XQMAKESPEC/tqmake.conf.new + mv $XQMAKESPEC/tqmake.conf.new $XQMAKESPEC/tqmake.conf fi fi if [ $AUTOTHREAD = never ]; then if [ "$CFG_THREAD" = "yes" ]; then echo echo "ERROR: TQt is not configured to support threading on this platform" - echo " See the THREAD settings in $XQMAKESPEC/qmake.conf" + echo " See the THREAD settings in $XQMAKESPEC/tqmake.conf" echo exit 2 fi @@ -1344,7 +1344,7 @@ fi #------------------------------------------------------------------------------- -# tests that don't need qmake (must be run before displaying help) +# tests that don't need tqmake (must be run before displaying help) #------------------------------------------------------------------------------- # auto-detect precompiled header support @@ -1766,7 +1766,7 @@ Configure options: -fast .............. Configure TQt quickly by generating Makefiles only for library and subdirectory targets. All other Makefiles - are created as wrappers, which will in turn run qmake. + are created as wrappers, which will in turn run tqmake. * -no-fast ........... Configure TQt normally by generating Makefiles for all project files. @@ -2058,7 +2058,7 @@ irix-cc*) esac # ----------------------------------------------------------------------------- -# build qmake +# build tqmake # ----------------------------------------------------------------------------- # symlink includes @@ -2073,9 +2073,9 @@ if [ "$OPT_SHADOW" = "yes" ]; then QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=${outpath}/include\"" fi -# build qmake +# build tqmake if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; - echo "Creating qmake. Please wait..." + echo "Creating tqmake. Please wait..." rm -f mkspecs/default ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default # fix makefiles @@ -2084,13 +2084,13 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; EXTRA_CFLAGS= in_mkfile="${mkfile}.in" if [ "$mkfile" = "Makefile" ]; then -# if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then -# (cd qmake && qmake) >/dev/null 2>&1 && continue +# if which tqmake >/dev/null 2>&1 && [ -f tqmake/tqmake.pro ]; then +# (cd tqmake && tqmake) >/dev/null 2>&1 && continue # fi in_mkfile="${mkfile}.unix" fi - in_mkfile="$relpath/qmake/$in_mkfile" - mkfile="$outpath/qmake/$mkfile" + in_mkfile="$relpath/tqmake/$in_mkfile" + mkfile="$outpath/tqmake/$mkfile" if [ -f "$mkfile" ]; then [ "$Edition" = "troll" ] && $WHICH chflags >/dev/null 2>&1 && chflags nouchg $mkfile rm -f $mkfile @@ -2103,19 +2103,19 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)" EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" - grep "^QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile - grep "^QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile - grep "^QMAKE_CFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile - grep "^QMAKE_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS)," >>$mkfile - grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile + grep "^QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile + grep "^QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile + grep "^QMAKE_CFLAGS[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile + grep "^QMAKE_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS)," >>$mkfile + grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile if [ "$CFG_DEBUG" = "yes" ]; then - grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile - grep "^QMAKE_CXXFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG)," >>$mkfile + grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile + grep "^QMAKE_CXXFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG)," >>$mkfile EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" else - grep "QMAKE_CFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile - grep "^QMAKE_CXXFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE)," >>$mkfile + grep "QMAKE_CFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/tqmake.conf >>$mkfile + grep "^QMAKE_CXXFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/tqmake.conf | sed "s,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE)," >>$mkfile EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" fi @@ -2157,21 +2157,21 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; if [ "$Edition" = "troll" ] && $WHICH makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then - (cd $outpath/qmake && $MAKE -f $mkfile depend) >/dev/null 2>&1 + (cd $outpath/tqmake && $MAKE -f $mkfile depend) >/dev/null 2>&1 fi done - (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2 + (cd $outpath/tqmake; $MAKE || (echo "tqmake failed to build. Aborting." && exit 2)) || exit 2 fi # clean up temporary tqconfig.h and tqmodules.h -rm -f $outpath/include/qmake/tqconfig.h -rm -f $outpath/include/qmake/tqmodules.h -rmdir $outpath/include/qmake +rm -f $outpath/include/tqmake/tqconfig.h +rm -f $outpath/include/tqmake/tqmodules.h +rmdir $outpath/include/tqmake #------------------------------------------------------------------------------- -# tests that need qmake +# tests that need tqmake #------------------------------------------------------------------------------- # work around broken X11 headers when using GCC 2.95 or later @@ -2186,7 +2186,7 @@ if [ $PLATFORM = "hpux-acc" -a "$CFG_STL" != "no" ]; then echo echo "As of aCC A.3.0.30 you may enable STL support in TQt by adding -AA" echo "to the QMAKE_CXXFLAGS and QMAKE_LFLAGS variables in" - echo "$XQMAKESPEC/qmake.conf" + echo "$XQMAKESPEC/tqmake.conf" echo "and re-running configure. Make sure to use the -AA compiler switch" echo "in all your software projects using TQt as it turns on the new C++" echo "Standard Library which is not binary compatible with the old one." @@ -2473,7 +2473,7 @@ fi [ '!' -z "$l_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"LIBS+=$l_FLAGS\"" if [ '!' -z "$R_FLAGS" ]; then - if grep QMAKE_RPATH $XQMAKESPEC/qmake.conf >/dev/null; then + if grep QMAKE_RPATH $XQMAKESPEC/tqmake.conf >/dev/null; then echo # Using -R/-rpath, so no need to warn else echo @@ -2557,7 +2557,7 @@ fi case "$COMPILER" in g++*) # GNU C++ - QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` + QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/tqmake.conf | sed "s,.* *= *\(.*\)$,\1,"` COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'` case "$COMPILER_VERSION" in 2.95.*) @@ -2576,7 +2576,7 @@ g++*) ;; clang) # Clang - QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` + QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/tqmake.conf | sed "s,.* *= *\(.*\)$,\1,"` COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'` case "$COMPILER_VERSION" in *) @@ -2818,10 +2818,10 @@ fi #------------------------------------------------------------------------------- -# save configuration into .qmake.cache +# save configuration into .tqmake.cache #------------------------------------------------------------------------------- -CACHEFILE=$outpath/.qmake.cache +CACHEFILE=$outpath/.tqmake.cache [ -f $CACHEFILE.tmp ] && rm -f $CACHEFILE.tmp cat >>$CACHEFILE.tmp <>$CACHEFILE.tmp - [ -r "$outpath/.qmake.incremental" ] && echo "include($outpath/.qmake.incremental)" >>$CACHEFILE.tmp + [ -r "$outpath/.tqmake.incremental" ] && echo "include($outpath/.tqmake.incremental)" >>$CACHEFILE.tmp fi -# replace .qmake.cache if it differs from the newly created temp file +# replace .tqmake.cache if it differs from the newly created temp file if cmp -s $CACHEFILE.tmp $CACHEFILE; then rm -f $CACHEFILE.tmp else @@ -2933,8 +2933,8 @@ else fi if [ "$OPT_VERBOSE" = "yes" ]; then - echo "qmake vars ...... $QMAKE_VARS" - echo "qmake switches .. $QMAKE_SWITCHES" + echo "tqmake vars ...... $QMAKE_VARS" + echo "tqmake switches .. $QMAKE_SWITCHES" fi [ "$OPT_CONCURRENT" != "0" ] && echo "Concurrent .......... $OPT_CONCURRENT" @@ -3172,7 +3172,7 @@ for file in .projects .projects.3; do for a in `cat $file`; do case $a in *-kde.pro|*qtmain.pro) continue ;; - */qmake/qmake.pro) continue ;; + */tqmake/tqmake.pro) continue ;; *projects.pro) continue ;; *-pro.pro) [ "x$Edition" != "xpro" ] && continue @@ -3185,8 +3185,8 @@ for file in .projects .projects.3; do OUTDIR=$outpath/$dir if [ -f "${OUTDIR}/Makefile" ] && [ "$OPT_FAST" = "yes" ]; then # fast configure - the makefile exists, skip it - # since the makefile exists, it was generated by qmake, which means we - # can skip it, since qmake has a rule to regenerate the makefile if the .pro + # since the makefile exists, it was generated by tqmake, which means we + # can skip it, since tqmake has a rule to regenerate the makefile if the .pro # file changes... [ "$OPT_VERBOSE" = "yes" ] && echo " skipping $a" continue; @@ -3211,7 +3211,7 @@ for file in .projects .projects.3; do # WARNING: This makefile will be replaced with a real makefile. # All changes made to this file will be lost. -all clean install qmake Makefile: FORCE +all clean install tqmake Makefile: FORCE $outpath/bin/tqmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a cd $OUTDIR \$(MAKE) \$@ diff --git a/doc/appicon.doc b/doc/appicon.doc index 0764cab0..fccb26f5 100644 --- a/doc/appicon.doc +++ b/doc/appicon.doc @@ -43,7 +43,7 @@ called e.g. "myapp.rc" in which you put a single line of text: IDI_ICON1 ICON DISCARDABLE "myappico.ico" \endcode -Finally, assuming you are using \link qmake-manual.book qmake\endlink +Finally, assuming you are using \link tqmake-manual.book tqmake\endlink to generate your makefiles, add this line to your "myapp.pro" file: \code @@ -53,7 +53,7 @@ RC_FILE = myapp.rc Regenerate your makefile and your application. The .exe file will now be represented with your icon e.g. in Explorer. -If you do not use \link qmake-manual.book qmake\endlink, the necessary +If you do not use \link tqmake-manual.book tqmake\endlink, the necessary steps are: first, run the "rc" program on the .rc file, then link your application with the resulting .res file. @@ -76,7 +76,7 @@ different sized icons (for use in different contexts) as well as the masks that go with them. Save the set of icons to a file in your project directory. -If you are using \link qmake-manual.book qmake\endlink to generate +If you are using \link tqmake-manual.book tqmake\endlink to generate your make files, you only need to add a single line to your \c .pro project file. For example, if the name of your icon file is \c{myapp.icns}, and your project file is \c{myapp.pro}, add this line @@ -84,11 +84,11 @@ to \c{myapp.pro}: \code RC_FILE = myapp.icns \endcode -This will ensure that \link qmake-manual.book qmake\endlink puts your +This will ensure that \link tqmake-manual.book tqmake\endlink puts your icons in the proper place and creates an \c{Info.plist} entry for the icon. -If you do not use \link qmake-manual.book qmake\endlink, you must do +If you do not use \link tqmake-manual.book tqmake\endlink, you must do the following manually: \list 1 \i Create an Info.plist file for your application (using the diff --git a/doc/changes.doc b/doc/changes.doc index 773e08bc..c974731e 100644 --- a/doc/changes.doc +++ b/doc/changes.doc @@ -442,12 +442,12 @@ used by both TQt Designer and TQt Linguist for browsing their help documentation. -\section1 qmake +\section1 tqmake -To ease portability we now provide the \link qmake-manual.book -qmake\endlink utility to replace tmake. QMake is a C++ version of +To ease portability we now provide the \link tqmake-manual.book +tqmake\endlink utility to replace tmake. TQMake is a C++ version of tmake which offers additional functionallity that is difficult to -reproduce in tmake. Trolltech uses qmake in its build system for Qt +reproduce in tmake. Trolltech uses tqmake in its build system for Qt and related products and we have released it as free software. */ diff --git a/doc/html/appicon.html b/doc/html/appicon.html index 1b66d05b..f1a6642a 100644 --- a/doc/html/appicon.html +++ b/doc/html/appicon.html @@ -70,7 +70,7 @@ called e.g. "myapp.rc" in which you put a single line of text: IDI_ICON1 ICON DISCARDABLE "myappico.ico" -

Finally, assuming you are using qmake +

Finally, assuming you are using tqmake to generate your makefiles, add this line to your "myapp.pro" file: 

 RC_FILE = myapp.rc
@@ -78,7 +78,7 @@ RC_FILE = myapp.rc
  
 
 Regenerate your makefile and your application. The .exe file will now be
 represented with your icon e.g. in Explorer.
-
 If you do not use qmake, the necessary
+
 If you do not use tqmake, the necessary
 steps are: first, run the "rc" program on the .rc file, then link your
 application with the resulting .res file.
 
 
 Setting the Application Icon on Mac OS X
@@ -97,7 +97,7 @@ Developer/Application folder). Icon Composer allows you to import sever
 different sized icons (for use in different contexts) as well as the masks
 that go with them. Save the set of icons to a file in your project
 directory.
-
 If you are using qmake to generate
+
 If you are using tqmake to generate
 your make files, you only need to add a single line to your .pro
 project file. For example, if the name of your icon file is
 myapp.icns, and your project file is myapp.pro, add this line
@@ -106,10 +106,10 @@ to myapp.pro:
 RC_FILE = myapp.icns
-This will ensure that qmake puts your +This will ensure that tqmake puts your icons in the proper place and creates an Info.plist entry for the icon. -

If you do not use qmake, you must do +

If you do not use tqmake, you must do the following manually:

  1. Create an Info.plist file for your application (using the diff --git a/doc/html/assistant-6.html b/doc/html/assistant-6.html index d5114eb8..1665b53c 100644 --- a/doc/html/assistant-6.html +++ b/doc/html/assistant-6.html @@ -32,7 +32,7 @@ body { background: #ffffff; color: black; }

    Customizing TQt Assistant

    TQt Assistant can be customized by adding and removing documentation from its documentation set. In addition, TQt Assistant introduces the profiles option, which enables its properties to change, for example, the default startup page, and application icon.

    Modifying the Default Documentation Set

    -

    When it is started without any options, TQt Assistant displays a default set of documentation. When TQt is installed, the default documentation set in TQt Assistant contains the TQt reference documentation as well as the tools that come with TQt, such as TQt Designer and qmake.

    +

    When it is started without any options, TQt Assistant displays a default set of documentation. When TQt is installed, the default documentation set in TQt Assistant contains the TQt reference documentation as well as the tools that come with TQt, such as TQt Designer and tqmake.

    Documentation can be added or removed from TQt Assistant by adding and removing the content files. The format of the content files are specified below. To add a content file, type the following command line option: -addContentFile docfile. To remove a content file from the default set, type the following command line option: -removeContentFile docfile. For example:

     1: > assistant -addContentFile file.dcf
diff --git a/doc/html/commonproblems.html b/doc/html/commonproblems.html
index d2b396f8..dc964def 100644
--- a/doc/html/commonproblems.html
+++ b/doc/html/commonproblems.html
@@ -72,7 +72,7 @@ the relevant release of TQt.
 
     
    Programmers need to run tqmoc and other tools such as tquic. These
 tools are usually located in the bin subdirectory of TQt distributions.
 Either run "$TQTDIR"/bin/tqmoc and "$TQTDIR"/bin/tquic or add "$TQTDIR"/bin
-to your PATH and run tqmoc and tquic. If you use qmake the
+to your PATH and run tqmoc and tquic. If you use tqmake the
 appropriate lines will be added to your Makefiles so that tquic and
 tqmoc will be executed as required.
 
     
    Static or shared libraries - Link time
diff --git a/doc/html/designer-manual-1.html b/doc/html/designer-manual-1.html
index a7118f66..15f19ee8 100644
--- a/doc/html/designer-manual-1.html
+++ b/doc/html/designer-manual-1.html
@@ -35,10 +35,10 @@ body { background: #ffffff; color: black; }
 
    TQt Designer helps you build user interfaces with layout tools that move and scale your widgets (controls in Windows terminology) automatically at runtime. The resulting interfaces are both functional and attractive, comfortably suiting your users' operating environments and preferences. TQt Designer supports TQt's signals and slots mechanism for type-safe communication between widgets. TQt Designer includes a code editor which you can use to embed your own custom slots inside the generated code. Those who prefer to separate generated code from hand crafted code can continue to use the subclassing approach pioneered in the first version of TQt Designer.
    
 
    The manual introduces you to TQt Designer by leading you through the development of example applications. The first seven chapters are tutorials, each designed to be as self-contained as possible. Every chapter, except the first three, assumes that you are familiar with the material in chapters two and three which cover the basics of building a TQt application with TQt Designer. Here's a brief overview of the chapters:
    
 
    • Chapter one, Quick Start, is a fast hands-on tutorial that takes you through the creation of a short, simple dialog application. The aim of this chapter is to give you a feel for how TQt Designer works, with explanations and details deferred to later chapters.
      
-
    • Chapter two, Creating a Main Window Application, introduces TQt Designer and takes you step by step through the creation of a small but fully functional application. Along the way you will learn how to create a main window with menus, toolbars and a status bar. Most of the application's implementation will be covered, but the custom dialogs are deferred until chapter three. In the course of this chapter you will use the form and property editors to customize the application. You'll also learn how to use TQt's signals and slots mechanism and TQt Designer's built-in code editor to make the application functional. We will also explain how to use qmake to generate a Makefile so that you can compile and run the application.
      
+
    • Chapter two, Creating a Main Window Application, introduces TQt Designer and takes you step by step through the creation of a small but fully functional application. Along the way you will learn how to create a main window with menus, toolbars and a status bar. Most of the application's implementation will be covered, but the custom dialogs are deferred until chapter three. In the course of this chapter you will use the form and property editors to customize the application. You'll also learn how to use TQt's signals and slots mechanism and TQt Designer's built-in code editor to make the application functional. We will also explain how to use tqmake to generate a Makefile so that you can compile and run the application.
      
 
    • In chapter three, Creating Dialogs, we will create the custom dialogs required by the main window application created in chapter two. In addition to demonstrating various ways of creating dialogs, you will also learn how to lay out forms using the layout tools.
      
 
    • Chapter four, The Designer Approach, provides information on the TQt Designer approach to developing applications, and explains some of the rationale behind TQt Designer.
      
-
    • Chapter five, Subclassing and Dynamic Dialogs, will show you how to subclass a form; this allows you to clearly separate the user interface from the underlying code that implements its functionality. Additional information on qmake and tquic is included in this chapter. This chapter will also explain how you can dynamically load dialogs from .ui files into your application using TQWidgetFactory and how to access the widgets and sub-widgets of these dialogs.
      
+
    • Chapter five, Subclassing and Dynamic Dialogs, will show you how to subclass a form; this allows you to clearly separate the user interface from the underlying code that implements its functionality. Additional information on tqmake and tquic is included in this chapter. This chapter will also explain how you can dynamically load dialogs from .ui files into your application using TQWidgetFactory and how to access the widgets and sub-widgets of these dialogs.
      
 
    • Chapter six, Creating Custom Widgets, explains how you can create your own custom widgets. Both the simple method, that was introduced with the first version of TQt Designer, and the new more powerful method using plugins, are explained.
      
 
    • Chapter seven, Creating Database Applications introduces TQt's SQL classes and takes you through an example that demonstrates how to execute SQL queries and how to set up master-detail relationships, perform drilldown and handle foreign keys.
      
 
    • Chapter eight, Customizing and Integrating TQt Designer, focuses on TQt Designer itself, showing you how to customize Designer, how to integrate Designer with Visual Studio and how to create Makefiles.
      
diff --git a/doc/html/designer-manual-13.html b/doc/html/designer-manual-13.html
index 34d49611..5d4231e9 100644
--- a/doc/html/designer-manual-13.html
+++ b/doc/html/designer-manual-13.html
@@ -204,7 +204,7 @@ body { background: #ffffff; color: black; }
 
      
 
      
 
      Project Settings- C++ Tab
      
-
      Click the C++ Tab to change the qmake options. See the qmake documentation for details on what these options mean. Click the 'Template' combobox and choose application or library to create makefiles for building applications or libraries. Click the 'Config' combobox to select the project configuration and compiler options for all platforms, or specific platforms. Type the Config value in the line edit. Note: Unix defaults to a shared library. If you want a shared library in Windows, type 'dll' at the end of the default config command and make sure you select lib from the Template combobox. Click the 'Libs' combobox to select a platform. Type the libraries in the line edit. Click the 'Defines' combobox and select a platform. 'Defines' values are added as compiler pre-processor macros. Type the 'Defines' values in the line edit. Click the 'Includepath' combobox to select a platform. Includepath specifies the directories that should be searched for include files when compiling the project. Type the 'Includepath' values in the line edit.
      
+
      Click the C++ Tab to change the tqmake options. See the tqmake documentation for details on what these options mean. Click the 'Template' combobox and choose application or library to create makefiles for building applications or libraries. Click the 'Config' combobox to select the project configuration and compiler options for all platforms, or specific platforms. Type the Config value in the line edit. Note: Unix defaults to a shared library. If you want a shared library in Windows, type 'dll' at the end of the default config command and make sure you select lib from the Template combobox. Click the 'Libs' combobox to select a platform. Type the libraries in the line edit. Click the 'Defines' combobox and select a platform. 'Defines' values are added as compiler pre-processor macros. Type the 'Defines' values in the line edit. Click the 'Includepath' combobox to select a platform. Includepath specifies the directories that should be searched for include files when compiling the project. Type the 'Includepath' values in the line edit.
      
 
      Cick OK to accept changes to the project settings. Click Cancel to exit the dialog without making any changes to the project settings.
      
 
      The Search Dialogs
      
 
      Find Text Dialog
      
diff --git a/doc/html/designer-manual-2.html b/doc/html/designer-manual-2.html
index b925f7ad..189e7dc5 100644
--- a/doc/html/designer-manual-2.html
+++ b/doc/html/designer-manual-2.html
@@ -277,7 +277,7 @@ body { background: #ffffff; color: black; }
 
    • Click Save to save the project.
      
 
    Compiling and Running the Application
    
 
    • Start or switch to a console, and navigate to the directory where the project is saved.
      
-
    • Run qmake on the project file (metric.pro) by typing qmake -o Makefile metric.pro.
      
+
    • Run tqmake on the project file (metric.pro) by typing tqmake -o Makefile metric.pro.
      
 
    • Run make (or nmake depending on your system).
      
 
    • After the project has compiled, run the application.
      
 
    Wrapping Up
    
diff --git a/doc/html/designer-manual-3.html b/doc/html/designer-manual-3.html
index 46dc87d3..aadcad5a 100644
--- a/doc/html/designer-manual-3.html
+++ b/doc/html/designer-manual-3.html
@@ -55,7 +55,7 @@ body { background: #ffffff; color: black; }
 
    
 
     Creating a Project
    
 
    Whenever you create a new application we recommend that you create a project file and open the project rather than individual .ui files. Using a project has the advantage that all the forms you create for the project are available via a single mouse click rather than having to be loaded individually through file open dialogs. An additional benefit of using project files is that they allow you to store all your images in a single file rather than duplicate them in each form in which they appear. See The Designer Approach chapter's Project management section for detailed information on the benefits of using project files.
    
-
    Project files use the .pro suffix and are used by the qmake tool to create makefiles for the relevant target platforms.
    
+
    Project files use the .pro suffix and are used by the tqmake tool to create makefiles for the relevant target platforms.
    
 
    
 
    Create a new project as follows:
    
 
    1. Click File|New to invoke the New File dialog.
      
@@ -492,9 +492,9 @@ body { background: #ffffff; color: black; }
  
      This ensures that our application will cleanly terminate. Later we'll revise this function to give the user the opportunity to save any unsaved data.
      
 
      Building and Running
      
 
      We now have some code in the application and a main.cpp containing the main() function, so we should be able to compile, link and run the application.
      
-
      Click File|Save to ensure that all our work is saved to disk. Open a console (e.g. an xterm or DOS window), change directory to where you have saved the colortool project, and run qmake to generate a Makefile:
      
+
      Click File|Save to ensure that all our work is saved to disk. Open a console (e.g. an xterm or DOS window), change directory to where you have saved the colortool project, and run tqmake to generate a Makefile:
      
 
      -    qmake -o Makefile colortool.pro
+    tqmake -o Makefile colortool.pro
 
      
 
      Now make the project (run nmake on Windows, make on other platforms). Providing you commented out the "findForm" and "loadSettings" lines in the init() function, the program should build. (If it doesn't build see the Troubleshooting section.)
      
 
      Once the make has finished, run the program. You still can't change views since we haven't written the code for that yet, but it does create a default set of colors. You can terminate the application by clicking the close (X) button or by clicking File|Exit.
      
diff --git a/doc/html/designer-manual-5.html b/doc/html/designer-manual-5.html
index 9e8e4281..80e4f072 100644
--- a/doc/html/designer-manual-5.html
+++ b/doc/html/designer-manual-5.html
@@ -57,9 +57,9 @@ body { background: #ffffff; color: black; }
 
      When you've opened or created a project you can set up its database connections using the Edit Database Connections dialog (invoked by the Project|Database Connections menu option). The connections you make are stored in a .db file. When you reload a project you can reconnect by going to the Edit Database Connections dialog, clicking a connection in the list and clicking the Connect button.
      
 
      In most non-trivial database applications you will want to access the database from more than one form. This is why the .db file is part of a project, not just part of a single form.
      
 
      .pro files
      
-
      TQt Designer needs to store information on projects, for example, the list of forms, the image collection and information about available databases and how to access them. The majority of TQt users already use a project file format to create multiplatform makefiles: tmake (and with TQt 3.0 qmake) project .pro files. These files already contain the list of forms, .ui files, used in the project for tquic.
      
-
      We've extended the sections in the .pro file to include the extra information that TQt Designer needs to manage projects. For example, when you add a form to your project in TQt Designer, it is automatically added to the FORMS section of the project file, and thus qmake will generate the required build rules without any further work. Similarly, the images are added to the IMAGES section and thus gets automatically compiled into your executable.
      
-
      We don't force you to use qmake; if you prefer another build system, for example automake/autoconf or jam, you can still continue to use it. Look upon the .pro file as a file that describes the GUI part of your application. All you need to do -- as previously -- is add the .ui files and the images collection to your own Makefiles.
      
+
      TQt Designer needs to store information on projects, for example, the list of forms, the image collection and information about available databases and how to access them. The majority of TQt users already use a project file format to create multiplatform makefiles: tmake (and with TQt 3.0 tqmake) project .pro files. These files already contain the list of forms, .ui files, used in the project for tquic.
      
+
      We've extended the sections in the .pro file to include the extra information that TQt Designer needs to manage projects. For example, when you add a form to your project in TQt Designer, it is automatically added to the FORMS section of the project file, and thus tqmake will generate the required build rules without any further work. Similarly, the images are added to the IMAGES section and thus gets automatically compiled into your executable.
      
+
      We don't force you to use tqmake; if you prefer another build system, for example automake/autoconf or jam, you can still continue to use it. Look upon the .pro file as a file that describes the GUI part of your application. All you need to do -- as previously -- is add the .ui files and the images collection to your own Makefiles.
      
 
      Extending the functionality of a form
      
 
      First let us look at a small figure that shows the relationship between .ui files, generated code and application code:
      
 
      
diff --git a/doc/html/designer-manual-6.html b/doc/html/designer-manual-6.html
index 503dcd9d..38d68867 100644
--- a/doc/html/designer-manual-6.html
+++ b/doc/html/designer-manual-6.html
@@ -34,14 +34,14 @@ body { background: #ffffff; color: black; }
 
      Subclassing
      
 
      We'll start with a general description of how to subclass a form and follow with a short example. Note that subclassing has some disadvantages compared with putting your code into a form directly; see Extending the functionality of a form in The Designer Approach chapter for details.
      
 
      Generating Source Code from TQt Designer .ui Files
      
-
      TQt Designer reads and writes qmake .pro (project) files which are used to record the files used to build the application and from which Makefiles are generated. TQt Designer also reads and writes .ui (user interface) files. These are XML files that record the widgets, layouts, source code and settings you've used for a form. Every .ui file is converted by the tquic (user interface compiler) into a C++ .h file and a C++ .cpp file. These C++ files are then read by tqmoc (meta object compiler), and finally compiled by your compiler into a working application.
      
+
      TQt Designer reads and writes tqmake .pro (project) files which are used to record the files used to build the application and from which Makefiles are generated. TQt Designer also reads and writes .ui (user interface) files. These are XML files that record the widgets, layouts, source code and settings you've used for a form. Every .ui file is converted by the tquic (user interface compiler) into a C++ .h file and a C++ .cpp file. These C++ files are then read by tqmoc (meta object compiler), and finally compiled by your compiler into a working application.
      
 
      If you create applications wholly within TQt Designer you only need to create a main.cpp.
      
 
      If you create the main.cpp file within TQt Designer, it will automatically be added to your project file by TQt Designer. If you create the main.cpp file outside of TQt Designer you must add it to the project file manually by adding the following line at the end of your project's .pro file:
      
 
       SOURCES += main.cpp
 
      
-
      You can then use qmake to generate the Makefile. (For example qmake -o Makefile myproject.pro.) Running make (Linux or Unix compilers), or nmake (Visual C++), will then call tquic, tqmoc and your compiler as necessary to build your application.
      
-
      If you use TQt Designer to create your main window and dialogs, but also add other C++ files, or if you subclass any of your forms you will need to add these files to the .pro file so that they are compiled with the rest of your application's source files. Each .h file that you create separately from TQt Designer should be added to the HEADERS line, and each .cpp file should be added to the SOURCES line, just as we've done for main.cpp. If you get undefined reference errors it is worth checking that you've added the names of all your header and implementation files to the .pro file.
      
+
      You can then use tqmake to generate the Makefile. (For example tqmake -o Makefile myproject.pro.) Running make (Linux or Unix compilers), or nmake (Visual C++), will then call tquic, tqmoc and your compiler as necessary to build your application.
      
+
      If you use TQt Designer to create your main window and dialogs, but also add other C++ files, or if you subclass any of your forms you will need to add these files to the .pro file so that they are compiled with the rest of your application's source files. Each .h file that you create separately from TQt Designer should be added to the HEADERS line, and each .cpp file should be added to the SOURCES line, just as we've done for main.cpp. If you get undefined reference errors it is worth checking that you've added the names of all your header and implementation files to the .pro file.
      
 
      Subclassing a Form
      
 
      When subclassing a form it is helpful to use a naming convention to help us identify which files are generated from TQt Designer's .ui files and which are hand coded.
      
 
      Suppose, for example, that we are developing a dialog and writing the code directly in TQt Designer. We might call our dialog 'OptionsForm' and the .ui file, optionsform.ui. The automatically generated files will be optionsform.h and optionsform.cpp.
      
@@ -94,7 +94,7 @@ int main( int argc, char *argv[] )
 }

    Note that we're including creditformbase.h and instantiating a CreditFormBase object; once we've written our subclass we'll replace the header with our subclass, creditform.h, and instantiate a CreditForm.

    -

    We can now generate the application with qmake, e.g. qmake -o Makefile credit.pro, make it and run it. The form should run fine, but doesn't yet have the behaviour we require.

    +

    We can now generate the application with tqmake, e.g. tqmake -o Makefile credit.pro, make it and run it. The form should run fine, but doesn't yet have the behaviour we require.

    Creating the Subclass

    We need to create a header and an implementation file for our subclass. The code for our subclass is minimal. The header file is qt/tools/designer/examples/credit/creditform.h:

        #include "creditformbase.h"
@@ -134,7 +134,7 @@ int main( int argc, char *argv[] )
     }

    We call setAmount() in the constructor to ensure that the correct amount is shown when the form starts based on whichever radio button we checked in TQt Designer. In setAmount() we set the amount if the standard or none radio button is checked. If the user has checked the special radio button they are free to change the amount themselves.

    -

    To be able to test our subclass we change main.cpp to include creditform.h rather than creditformbase.h and change the instantiation of the creditForm object:

    +

    To be able to test our subclass we change main.cpp to include creditform.h rather than creditformbase.h and change the instantiation of the creditForm object:

        #include <tqapplication.h>
     #include "creditform.h"
 
@@ -154,7 +154,7 @@ int main( int argc, char *argv[] )
 HEADERS += creditform.h
 SOURCES += creditform.cpp
    -

    To test the form rerun qmake to regenerate the Makefile, then make and run.

    +

    To test the form rerun tqmake to regenerate the Makefile, then make and run.

    The subclassing example we've used is simple, but this reflects subclassing forms in TQt: it is easy to do.

    Creating Dynamic Dialogs from .ui Files

    TQt programs are capable of loading TQt Designer .ui files and instantiating the forms represented by the .ui files. Since the .ui file is not compiled it cannot include any C++ code, (e.g. slot implementations). In this section we will explain how to load a dynamic dialog and how to create a class that can be used to implement the dynamic dialog's custom slots.

    diff --git a/doc/html/designer-manual-7.html b/doc/html/designer-manual-7.html index 587cff34..fc45eeb9 100644 --- a/doc/html/designer-manual-7.html +++ b/doc/html/designer-manual-7.html @@ -244,7 +244,7 @@ CONFIG += qt warn_on release DBFILE = filechooser.db DEFINES += FILECHOOSER_IS_WIDGET -

    We can create the makefile using qmake: qmake -o Makefile filechooser.pro, then we can make and run the harness to test our new widget. Once we're satisfied that the custom widget is robust and has the behaviour we require we can embed it into a plugin.

    +

    We can create the makefile using tqmake: tqmake -o Makefile filechooser.pro, then we can make and run the harness to test our new widget. Once we're satisfied that the custom widget is robust and has the behaviour we require we can embed it into a plugin.

    Creating a Plugin

    TQt Plugins can be used to provide self-contained software components for TQt applications. TQt currently supports the creation of five kinds of plugins: codecs, image formats, database drivers, styles and custom widgets. In this section we will explain how to convert our filechooser custom widget into a TQt Designer custom widget plugin.

    A TQt Designer custom widget plugin is always derived from TQWidgetPlugin. The amout of code that needs to be written is minimal.

    @@ -372,7 +372,7 @@ INCLUDEPATH += $$QT_SOURCE_TREE/tools/designer/interfaces DBFILE = plugin.db

    qt/tools/designer/examples/filechooser/plugin/plugin.pro

    -

    Change the HEADERS line to list your plugin's header file plus a header file for each of your widgets. Make the equivalent change for the SOURCES line. If you create a Makefile with qmake and make the project the plugin will be created and placed in a directory where TQt Designer can find it. The next time you run TQt Designer it will detect your new plugin and load it automatically, displaying its icon in the toolbar you specified.

    +

    Change the HEADERS line to list your plugin's header file plus a header file for each of your widgets. Make the equivalent change for the SOURCES line. If you create a Makefile with tqmake and make the project the plugin will be created and placed in a directory where TQt Designer can find it. The next time you run TQt Designer it will detect your new plugin and load it automatically, displaying its icon in the toolbar you specified.

    Using the Widget Plugin

    Once the plugin has been compiled it will automatically be found and loaded by TQt Designer the next time TQt Designer is run. Use your custom widget just like any other.

    If you want to use the plugin in another of your projects you can link against it by adding an appropriate line to the project, e.g. by adding a line like this to the project's .pro file:

    diff --git a/doc/html/designer-manual-8.html b/doc/html/designer-manual-8.html index f22a272e..d3649124 100644 --- a/doc/html/designer-manual-8.html +++ b/doc/html/designer-manual-8.html @@ -67,7 +67,7 @@ body { background: #ffffff; color: black; }

    Edit Database Connections Dialog

    Choose Project|Database Connections from the menu bar. The Edit Database Connections dialog will appear. Click New Connection. For applications that use a single database it will probably be most convenient to use the default connection name of '(default)'. If you use more than one database then each one must be given a unique name. A driver must be chosen from the Driver combo box. The database name may be available in the Database Name combo box or may have to be typed in. The database name, username, password, hostname and port should be provided by your database system administrator. When the Connection information has been completed click Connect. If the connection is made the connection name will appear in the list box on the left hand side of the dialog. You can now close the dialog; the connection settings will remain in effect until you change or delete them or exit from TQt Designer.

    Warning: If you are using an existing SQLite database, ensure that the name you specify in the "Database Name" field is not the same as the existing database file. TQt Designer will create a configuration file using the name given for the database and will overwrite any existing files with the same name.

    -

    TQt Designer can remember database connection settings in qmake project files. Create a new project, e.g. click File|New, then click the 'C++ Project' icon to invoke the Project Settings dialog. Click the ellipsis button to invoke the Save As dialog; navigate to the project's directory (creating it if necessary). Make sure you're in the project's directory, then enter a project name of 'book.pro'. Click the Save button to return to the Project Settings dialog, then click OK. Next time you start TQt Designer instead of opening individual .ui files open the .pro project file instead and TQt Designer will automatically reload the project's connection settings. To activate the connection click Project|Database Connections. The connections previously saved with the project will be listed in the left hand list box. Click the connection you wish to use and then click Connect. This connection will be used from now on, e.g. for previewing TQDataTables. Opening a project file also causes TQt Designer to load in the list of forms associated with the project into the Project Overview window. In most of the explanation that follows we will assume that you use project files and have clicked Connect so that there is always a connection available when you work in TQt Designer.

    +

    TQt Designer can remember database connection settings in tqmake project files. Create a new project, e.g. click File|New, then click the 'C++ Project' icon to invoke the Project Settings dialog. Click the ellipsis button to invoke the Save As dialog; navigate to the project's directory (creating it if necessary). Make sure you're in the project's directory, then enter a project name of 'book.pro'. Click the Save button to return to the Project Settings dialog, then click OK. Next time you start TQt Designer instead of opening individual .ui files open the .pro project file instead and TQt Designer will automatically reload the project's connection settings. To activate the connection click Project|Database Connections. The connections previously saved with the project will be listed in the left hand list box. Click the connection you wish to use and then click Connect. This connection will be used from now on, e.g. for previewing TQDataTables. Opening a project file also causes TQt Designer to load in the list of forms associated with the project into the Project Overview window. In most of the explanation that follows we will assume that you use project files and have clicked Connect so that there is always a connection available when you work in TQt Designer.

    Setting Up Connections for Applications

    The applications you create must make their own connections to the SQL database. We provide an example function, createConnections(), that you can use as a basis for your own code.

    @@ -136,7 +136,7 @@ bool createConnections()
 
    1. Click on the form and change its name to 'BookForm' and its caption to 'Book'. Click on the TQDataTable and change its name to 'AuthorDataTable'.
      
 
    2. Click File|Save All.
      
 
    3. Open the project file, e.g. book.pro, in a plain text editor and add the line: SOURCES += main.cpp at the end of the file.
      
-
    4. Run qmake to generate the make file, e.g. qmake -o Makefile book.pro, then make and run the book program.
      
+
    5. Run tqmake to generate the make file, e.g. tqmake -o Makefile book.pro, then make and run the book program.
      
 
    This example shows how easy it is to use TQDataTable to show the contents of a database table or view. You can use the application we've just built to update and delete author records. In the examples that follow we will cover insertions, setting up master-detail relationships, drilldown and foreign key lookups.
    
 
    
 
     A Note on Foreign Keys
    
diff --git a/doc/html/designer-manual-9.html b/doc/html/designer-manual-9.html
index 8dbd68ff..feee3bad 100644
--- a/doc/html/designer-manual-9.html
+++ b/doc/html/designer-manual-9.html
@@ -101,15 +101,15 @@ body { background: #ffffff; color: black; }
 
    • New TQt Project -- A small application wizard
      
 
    • New TQt Dialog -- Add an empty TQt Dialog to the active project, or add an existing dialog
      
 
    • TQt GUI Designer -- Run TQt Designer
      
-
    • Open TQt Project -- Runs qmake with a .pro file
      
+
    • Open TQt Project -- Runs tqmake with a .pro file
      
 
    • Write TQt Project -- Saves the current VS project as a .pro file
      
 
    • Use TQt -- Add the TQt libraries to the active project
      
 
    • Add TQMoc -- Add tqmoc precompiler to the active file
      
 
    Double clicking a .ui file in the workspace overview will now launch TQt Designer.
    
 
    If you create a .cpp file which contains the TQ_OBJECT macro you will need an additional file which is generated by tqmoc to be included in your project. For example, if you have 'file.cpp', then the last line would be #include "file.moc" and the additional file would be called 'file.moc'. To ensure that Visual Studio executes the tqmoc and generates this file you must create a custom dependency. Double click the .cpp file (in your project workspace) that contains the TQ_OBJECT macro. Click the Add TQMoc toolbar button; this will create an empty .moc file in your project workspace. Right click the newly created .moc file, then click Settings from the pop-up menu to invoke the Project Settings dialog. Click the Custom Build tab. Click the Dependencies button to pop up the User Defined Dependencies dialog. Type in $(InputDir)\$(InputPath), then press Return. Click OK to leave the Dependencies dialog, then click OK to leave the Project Settings dialog.
    
 
    If you wish to delete the add-in remove it from the toolbar then delete the qmsdev.dll file from the add-ins directory.
    
-
    Creating Makefiles without qmake
    
-
    The qmake tool provided with TQt can create Makefiles appropriate to your platform based on .pro project files. This section describes the dependencies involved in building a TQt application and gives a couple of simple example Makefiles. This section assumes that you have a good understanding of Makefiles.
    
+
    Creating Makefiles without tqmake
    
+
    The tqmake tool provided with TQt can create Makefiles appropriate to your platform based on .pro project files. This section describes the dependencies involved in building a TQt application and gives a couple of simple example Makefiles. This section assumes that you have a good understanding of Makefiles.
    
 
    TQt Designer produces .ui files which are used to generate .h and .cpp files for the compiler to compile. The .ui files are processed by tquic. Classes which inherit from TQObject, e.g. those which use slots and signals, require an additional .cpp file to be generated. These files are generated by tqmoc and are named 'tqmoc_file.cpp' where the original .cpp file is called 'file.cpp'. If your .cpp file contains the TQ_OBJECT macro an additional file 'file.moc' should be generated which must be #included in the .cpp, normally at the end. This requires an extra dependency being created.
    
 
    Processing .ui files with tquic is done twice:
    
 
    @@ -169,7 +169,7 @@ myform.cpp: myform.h myform.ui
 myform.h: myform.ui
         tquic myform.ui -o myform.h
 
    
-
    To see more sophisticated Makefiles simply generate them using qmake on any of your TQt projects or any of the examples supplied with TQt.
    
+
    To see more sophisticated Makefiles simply generate them using tqmake on any of your TQt projects or any of the examples supplied with TQt.
    
 
    Importing Foreign File Formats
    
 
    To import a file in a supported foreign file format click File|Open, then click the File Type combobox to choose the file type you wish to load. Click the required file and TQt Designer will convert and load the file.
    
 
    The filters that TQt Designer uses to read foreign file formats are 'works in progress'. You may have different filters available in your version of TQt Designer than those described here. The easiest way to see which filters are available is to invoke the file open dialog; all your filters are listed in the File Type combobox.
    
diff --git a/doc/html/helpsystem-example.html b/doc/html/helpsystem-example.html
index 3b7df046..dac14807 100644
--- a/doc/html/helpsystem-example.html
+++ b/doc/html/helpsystem-example.html
@@ -470,7 +470,7 @@ in TQt Assistant.
 
     The main function is a standard implementation opening
 the application main window.
 
     To build the example go to the helpsystem directory
-(TQTDIR/examples/helpsystem) run qmake to generate the makefile, 
+(TQTDIR/examples/helpsystem) run tqmake to generate the makefile, 
 and use the make tool to build the library. 
 
 
    
diff --git a/doc/html/i18n.html b/doc/html/i18n.html
index bd7ba3bc..518b55ce 100644
--- a/doc/html/i18n.html
+++ b/doc/html/i18n.html
@@ -341,8 +341,8 @@ an example project file (.pro file):
 
     When you run lupdate or lrelease, you must give the name of the
 project file as a command-line argument.
 
     In this example, four exotic languages are supported: Danish, Finnish,
-Norwegian and Swedish. If you use qmake, you usually don't need an extra project
-file for lupdate; your qmake project file will work fine once
+Norwegian and Swedish. If you use tqmake, you usually don't need an extra project
+file for lupdate; your tqmake project file will work fine once
 you add the TRANSLATIONS entry.
 
     In your application, you must TQTranslator::load() the translation
 files appropriate for the user's language, and install them using TQApplication::installTranslator().
diff --git a/doc/html/index.html b/doc/html/index.html
index 20c22b9c..79d0b8b7 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -157,7 +157,7 @@ Licenses & Credits
 
  2.  TQt Designer
 
  3.  TQt Linguist
 
  4.  TQt Assistant
-
  5.  qmake
+
  6.  tqmake
 
 
 
diff --git a/doc/html/integration.html b/doc/html/integration.html
index e395653a..d36ebe4d 100644
--- a/doc/html/integration.html
+++ b/doc/html/integration.html
@@ -128,20 +128,20 @@ existing projects. It can also be started up by using the Ctrl+Shift+D key
 combination in Visual Studio.
 
     
     Using the 'Open TQt Project' button
 
    
-
     The 'Open TQt Project' button allows you to convert an existing qmake project file into a .dsp file which you can insert into
+
     The 'Open TQt Project' button allows you to convert an existing tqmake project file into a .dsp file which you can insert into
 your existing workspace. When you click the 'Open TQt Project'
-button, just select an existing qmake project file (a .pro
+button, just select an existing tqmake project file (a .pro
 file) and then click OK. You will get a message box at the end
 which asks you to insert the newly created .dsp file into your
 existing workspace.
 
     
     Using the 'Write TQt Project' button
 
    
-
     The 'Write TQt Project' button creates a qmake project (.pro)
+
     The 'Write TQt Project' button creates a tqmake project (.pro)
 file for your current project so that you can easily copy the files
-onto another platform and be able to use qmake to create a Makefile
+onto another platform and be able to use tqmake to create a Makefile
 on that other platform. All you need to do is make the project you
 want to create a .pro file for, and click on the button. Just
-name your qmake project file and click Save.
+name your tqmake project file and click Save.
 
     
     Using the 'Use TQt In Current Project' button
 
    
 
     The 'Use TQt In Current Project' button simply adds in the necessary
diff --git a/doc/html/keyfeatures30.html b/doc/html/keyfeatures30.html
index eaf55792..4645a782 100644
--- a/doc/html/keyfeatures30.html
+++ b/doc/html/keyfeatures30.html
@@ -339,11 +339,11 @@ Designer and TQt Linguist. It offers index searching, a contents
 overview, bookmarks history and incremental search. TQt Assistant is
 used by both TQt Designer and TQt Linguist for browsing their help
 documentation.
-
     
     qmake
+
     
     tqmake
 
    
-
     To ease portability we now provide the qmake utility to replace tmake. TQMake is a C++ version of
+
     To ease portability we now provide the tqmake utility to replace tmake. TQMake is a C++ version of
 tmake which offers additional functionallity that is difficult to
-reproduce in tmake. Trolltech uses qmake in its build system for TQt
+reproduce in tmake. Trolltech uses tqmake in its build system for TQt
 and related products and we have released it as free software.
 
     
 
diff --git a/doc/html/linguist-manual-2.html b/doc/html/linguist-manual-2.html
index ae9d3342..529f9f77 100644
--- a/doc/html/linguist-manual-2.html
+++ b/doc/html/linguist-manual-2.html
@@ -30,10 +30,10 @@ body { background: #ffffff; color: black; }
 
 
    [Prev: Introduction] [Home] [Next: Translators]
    
 
    Release Manager
    
-
    Two tools are provided for the release manager, lupdate and lrelease. These tools depend on qmake project files. You don't have to use qmake, though.
    
+
    Two tools are provided for the release manager, lupdate and lrelease. These tools depend on tqmake project files. You don't have to use tqmake, though.
    
 
    A third tool, tqm2ts, can be used for converting TQt 2.x message files to .ts files.
    
 
    TQt Project Files
    
-
    lupdate and lrelease depend on information in the application's .pro TQt project file. There must be an entry in the TRANSLATIONS section of the project file for each language that is additional to the native language. A typical entry looks like this:
    
+
    lupdate and lrelease depend on information in the application's .pro TQt project file. There must be an entry in the TRANSLATIONS section of the project file for each language that is additional to the native language. A typical entry looks like this:
    
 
        TRANSLATIONS    = tt2_fr.ts \
                       tt2_nl.ts
 
    
diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html
index fe06608a..5918e5d6 100644
--- a/doc/html/linguist-manual-4.html
+++ b/doc/html/linguist-manual-4.html
@@ -43,7 +43,7 @@ body { background: #ffffff; color: black; }
 
  7. Run lupdate to incorporate any new text added to the application. lupdate synchronizes the user-visible text from the application with the translations; it does not destroy any data.
    
 
  8. Steps 2 and 3 are repeated as often as necessary.
    
 
  9. When a release of the application is needed lrelease is run to read the .ts files and produce the .qm files used by the application at runtime.
    
-

For lupdate to work successfully, it must know which translation files to produce. The files are simply listed in the application's .pro TQt project file, for example:

+

For lupdate to work successfully, it must know which translation files to produce. The files are simply listed in the application's .pro TQt project file, for example:

    TRANSLATIONS    = tt2_fr.ts \
                       tt2_nl.ts
@@ -233,7 +233,7 @@ int main( int argc, char **argv )

Tutorial 1 Screenshot, English version

Creating a Latin Message File
-

The first step is to create a project file, tt1.pro, that lists all the source files for the project. The project file can be a qmake project file, or even an ordinary makefile. Any file that contains

+

The first step is to create a project file, tt1.pro, that lists all the source files for the project. The project file can be a tqmake project file, or even an ordinary makefile. Any file that contains

    SOURCES         = main.cpp
     TRANSLATIONS    = tt1_la.ts
@@ -283,7 +283,7 @@ int main( int argc, char **argv )

Tutorial 2 Screenshot, English version

-
TEMPLATE        = app
+
TEMPLATE        = app
 CONFIG          += qt warn_on
 HEADERS         = arrowpad.h \
                   mainwindow.h
@@ -419,7 +419,7 @@ TRANSLATIONS    = tt3_pt.ts
 
  • mainwindow.h contains the definition of MainWindow;
    
 
  • mainwindow.cpp contains the implementation of MainWindow;
    
 
  • main.cpp contains main();
    
-
  • tt3.pro is the qmake project file.
    
+
  • tt3.pro is the tqmake project file.
    
 
  • tt3_pt.ts is the Portuguese message file.
    
 
    Line by Line Walk-through
    
 
    The PrintPanel is defined in printpanel.h.
    
diff --git a/doc/html/mac-differences.html b/doc/html/mac-differences.html
index 62aa0a56..691a7c26 100644
--- a/doc/html/mac-differences.html
+++ b/doc/html/mac-differences.html
@@ -122,7 +122,7 @@ application bundle (the application directory), then you place these into a
 directory called Frameworks, a subdirectory of the application bundle.
 
     The application finds these dynamic libraries if the libraries have an
 install name of "@executable_path/../Frameworks/libname.dylib.
-
     If you use qmake and Makefiles, use the QMAKE_LFFLAGS_SONAME setting:
+
     If you use tqmake and Makefiles, use the QMAKE_LFFLAGS_SONAME setting:
 
     
     QMAKE_LFLAGS_SONAME  = -Wl,-install_name,@executable_path/../Frameworks/
 
    
@@ -158,7 +158,7 @@ have not been called yet).
 
     
     Plugin Support
 
    
 
     Note that it is not possible to build TQt plugins using Project Builder
-or Xcode. Use qmake to configure and
+or Xcode. Use tqmake to configure and
 build plugins.
 
     
     Compiler Settings
 
    
diff --git a/doc/html/porting.html b/doc/html/porting.html
index a9b0bbb5..ac6bbf52 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -149,13 +149,13 @@ library is static. If you just use the default configuration you
 don't need to set certain preprocessor defines.  In TQt 3.0, the
 default configuration of the TQt library is to build it as a shared
 library, therefore the preprocessor define QT_DLL is needed.
-
     If you use tmake with TQt 2.x, and now use qmake with TQt 3.x, then the
+
     If you use tmake with TQt 2.x, and now use tqmake with TQt 3.x, then the
 cause of the problem is with the project file. In the project file,
 there is usually line that looks like:
 
     CONFIG = ...
 
     this should be changed to 
 
     CONFIG += ...
-
     so that qmake can look at the configuration that TQt was built with and
+
     so that tqmake can look at the configuration that TQt was built with and
 set any relevant preprocessor defines in the makefile.
 
     
 
     Header file inclusion changes
diff --git a/doc/html/qmake.dcf b/doc/html/qmake.dcf
deleted file mode 100644
index a4ac65a2..00000000
--- a/doc/html/qmake.dcf
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
diff --git a/doc/html/qtmac-as-native.html b/doc/html/qtmac-as-native.html
index 0bd5d76d..3eb7ad1a 100644
--- a/doc/html/qtmac-as-native.html
+++ b/doc/html/qtmac-as-native.html
@@ -111,14 +111,14 @@ accessiblity, and hopefully a host of assistive devices.
 between their development toolkit and the platform's developer
 tools (for example MSVC, gmake, etc). TQt/Mac supports both Unix
 style Makefiles, and ProjectBuilder/Xcode project files by using
-the qmake tool. For example:
+the tqmake tool. For example:
 
     
    -   qmake -spec macx-pbuilder project.pro
+   tqmake -spec macx-pbuilder project.pro
    
    
  
-
     will generate an Xcode project file from project.pro. With qmake
+
     will generate an Xcode project file from project.pro. With tqmake
 you do not have to worry about rules for TQt's preprocessors (tqmoc
-and tquic) since qmake automatically handles them and ensures that
+and tquic) since tqmake automatically handles them and ensures that
 everything necessary is linked into your application.
 
     TQt does not entirely interact with the development environment (for
 example plugins to set a file to 'mocable' from within the Xcode
diff --git a/doc/html/signalsandslots.html b/doc/html/signalsandslots.html
index 8653dd36..9c6c16bf 100644
--- a/doc/html/signalsandslots.html
+++ b/doc/html/signalsandslots.html
@@ -173,7 +173,7 @@ connection between them initially.
 
     Run the tqmoc on class definitions that contain
 signals or slots. This produces a C++ source file which should be compiled
 and linked with the other object files for the application. If you use
-qmake, the makefile rules to
+tqmake, the makefile rules to
 automatically invoke the tqmoc will be added to
 your makefile for you.
 
     
     Signals
diff --git a/doc/html/sql-driver.html b/doc/html/sql-driver.html
index 41bb1c06..955c89e8 100644
--- a/doc/html/sql-driver.html
+++ b/doc/html/sql-driver.html
@@ -130,12 +130,12 @@ transactions are enabled by default.
 
     You need the MySQL header files and as well as the shared library
 libmysqlclient.so. Depending on your Linux distribution you need to
 install a package which is usually called "mysql-devel".
-
     Tell qmake where to find the MySQL
+
     Tell tqmake where to find the MySQL
 header files and shared libraries (here it is assumed that MySQL is
 installed in /usr/local) and run make:
 
     
     cd $TQTDIR/plugins/src/sqldrivers/mysql
-qmake -o Makefile "INCLUDEPATH+=/usr/local/include" "LIBS+=-L/usr/local/lib -lmysqlclient" mysql.pro
+tqmake -o Makefile "INCLUDEPATH+=/usr/local/include" "LIBS+=-L/usr/local/lib -lmysqlclient" mysql.pro
 make
 
    
  
@@ -147,7 +147,7 @@ Build the plugin as follows (here it is assumed that MySQL is
 installed in C:\MYSQL):
 
     
     cd %TQTDIR%\plugins\src\sqldrivers\mysql
-qmake -o Makefile "INCLUDEPATH+=C:\MYSQL\INCLUDE" "LIBS+=C:\MYSQL\LIB\OPT\LIBMYSQL.LIB" mysql.pro
+tqmake -o Makefile "INCLUDEPATH+=C:\MYSQL\INCLUDE" "LIBS+=C:\MYSQL\LIB\OPT\LIBMYSQL.LIB" mysql.pro
 nmake
 
    
  
@@ -189,27 +189,27 @@ Client install.
 
  •  libclntsh.so (all versions)
 
  •  libwtc8.so (only Oracle 8) or libwtc9.so (only Oracle 9)
 
-
     Tell qmake where to find the Oracle header files and shared
+
     Tell tqmake where to find the Oracle header files and shared
 libraries (it is assumed that the variable $ORACLE_HOME points to
 the directory where Oracle is installed) and run make:
 
     If you are using Oracle 8:
 
     cd $TQTDIR/plugins/src/sqldrivers/oci
-qmake -o Makefile "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc8" oci.pro
+tqmake -o Makefile "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc8" oci.pro
 make
 
    
  
 
     For Oracle version 9:
 
     cd $TQTDIR/plugins/src/sqldrivers/oci
-qmake -o Makefile "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc9" oci.pro
+tqmake -o Makefile "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc9" oci.pro
 make
 
    
  
 
     For Oracle version 10:
 
     cd $TQTDIR/plugins/src/sqldrivers/oci
-qmake -o Makefile "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh" oci.pro
+tqmake -o Makefile "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh" oci.pro
 make
 
    
  
@@ -230,7 +230,7 @@ installed in C:\oracle):
 set INCLUDE=%INCLUDE%;c:\oracle\oci\include
 set LIB=%LIB%;c:\oracle\oci\lib\msvc
 cd %TQTDIR%\plugins\src\sqldrivers\oci
-qmake -o Makefile oci.pro
+tqmake -o Makefile oci.pro
 nmake
 
    • 
  
@@ -283,12 +283,12 @@ will convert all Unicode strings to local 8 bit.
 
     It is recommended that you use unixODBC. You can find the latest
 version and ODBC drivers at http://www.unixodbc.org.
 You need the unixODBC header files and shared libraries.
-
     Tell qmake where to find the unixODBC header files and shared
+
     Tell tqmake where to find the unixODBC header files and shared
 libraries (here it is assumed that unixODBC is installed in
 /usr/local/unixODBC) and run make:
 
     
     cd $TQTDIR/plugins/src/sqldrivers/odbc
-qmake "INCLUDEPATH+=/usr/local/unixODBC/include" "LIBS+=-L/usr/local/unixODBC/lib -lodbc"
+tqmake "INCLUDEPATH+=/usr/local/unixODBC/include" "LIBS+=-L/usr/local/unixODBC/lib -lodbc"
 make
 
    
  
@@ -298,7 +298,7 @@ make
 right directories. You just have to build the plugin as follows:
 
     
     cd %TQTDIR%\plugins\src\sqldrivers\odbc
-qmake -o Makefile odbc.pro
+tqmake -o Makefile odbc.pro
 nmake
 
    
  
@@ -347,12 +347,12 @@ distribution and run the configure script. If you've already installed
 a binary distribution you don't need to build it. The source
 distribution is needed because the TQPSQL7 plugin relies on a couple of
 header files that are usually not a part of the binary distribution.
-
     To make qmake find the PostgreSQL header files and shared
-libraries, run qmake the following way (assuming that the
+
     To make tqmake find the PostgreSQL header files and shared
+libraries, run tqmake the following way (assuming that the
 PostgreSQL sources can be found in /usr/src/psql):
 
     
     cd $TQTDIR/plugins/src/sqldrivers/psql
-qmake -o Makefile "INCLUDEPATH+=/usr/src/psql/src/include /usr/src/psql/src/interfaces/libpq" "LIBS+=-L/usr/lib -lpq" psql.pro
+tqmake -o Makefile "INCLUDEPATH+=/usr/src/psql/src/include /usr/src/psql/src/interfaces/libpq" "LIBS+=-L/usr/lib -lpq" psql.pro
 make
 
    
  
@@ -363,7 +363,7 @@ the PostgreSQL documentation. Assuming the PostgreSQL sources resides
 in C:\psql, build the plugin as follows:
 
     
     cd %TQTDIR%\plugins\src\sqldrivers\psql
-qmake -o Makefile "INCLUDEPATH+=C:\psql\src\include C:\psql\src\interfaces\libpq" psql.pro
+tqmake -o Makefile "INCLUDEPATH+=C:\psql\src\include C:\psql\src\interfaces\libpq" psql.pro
 nmake
 
    
  
@@ -388,10 +388,10 @@ Note for Linux users: Get the Open Client RPM from
 
     Regardless of which library you use, the shared object file
 libsybdb.so is needed. Set the SYBASE environment variable to
 point to the directory where you installed the client library and
-execute qmake:
+execute tqmake:
 
     
     cd $TQTDIR/plugins/src/sqldrivers/tds
-qmake -o Makefile "INCLUDEPATH=$SYBASE/include" "LIBS=-L$SYBASE/lib -lsybdb"
+tqmake -o Makefile "INCLUDEPATH=$SYBASE/include" "LIBS=-L$SYBASE/lib -lsybdb"
 make
 
    
  
@@ -401,7 +401,7 @@ make
 Open Client (http://www.sybase.com). You must include NTWDBLIB.LIB to build the plugin:
 
     
     cd %TQTDIR%\plugins\src\sqldrivers\tds
-qmake -o Makefile "LIBS+=NTWDBLIB.LIB" tds.pro
+tqmake -o Makefile "LIBS+=NTWDBLIB.LIB" tds.pro
 nmake
 
    
  
@@ -426,7 +426,7 @@ in DB2 (see TQSqlQuery::setForwardOnly<
 
 
     
     cd $TQTDIR/plugins/src/sqldrivers/db2
-qmake -o Makefile "INCLUDEPATH+=$DB2DIR/include" "LIBS+=-L$DB2DIR/lib -ldb2"
+tqmake -o Makefile "INCLUDEPATH+=$DB2DIR/include" "LIBS+=-L$DB2DIR/lib -ldb2"
 make
 
    
  
@@ -436,7 +436,7 @@ make
 right directories. You just have to build the plugin as follows:
 
     
     cd %TQTDIR%\plugins\src\sqldrivers\db2
-qmake -o Makefile "INCLUDEPATH+=<DB2 home>/sqllib/include" "LIBS+=<DB2 home>/sqllib/lib/db2cli.lib"
+tqmake -o Makefile "INCLUDEPATH+=<DB2 home>/sqllib/include" "LIBS+=<DB2 home>/sqllib/lib/db2cli.lib"
 nmake
 
    
  
@@ -468,7 +468,7 @@ build it manually (replace $SQLITE by the directory where SQLite
 resides):
 
     
     cd $TQTDIR/plugins/src/sqldrivers/sqlite
-qmake -o Makefile "INCLUDEPATH+=$SQLITE/include" "LIBS+=-L$SQLITE/lib -lsqlite"
+tqmake -o Makefile "INCLUDEPATH+=$SQLITE/include" "LIBS+=-L$SQLITE/lib -lsqlite"
 make
 
    
  
@@ -501,7 +501,7 @@ or the free edition of Interbase.
 /opt/interbase:
 
     
     cd $TQTDIR/plugins/src/sqldrivers/ibase
-qmake -o Makefile "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib" ibase.pro
+tqmake -o Makefile "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib" ibase.pro
 make
 
    
  
@@ -511,7 +511,7 @@ make
 C:\interbase:
 
     
     cd %TQTDIR%\plugins\src\sqldrivers\ibase
-qmake -o Makefile "INCLUDEPATH+=C:\interbase\include" ibase.pro
+tqmake -o Makefile "INCLUDEPATH+=C:\interbase\include" ibase.pro
 nmake
 
    
  
diff --git a/doc/html/tools-list.html b/doc/html/tools-list.html
index 90dcaac8..305f46c0 100644
--- a/doc/html/tools-list.html
+++ b/doc/html/tools-list.html
@@ -42,7 +42,7 @@ design forms
 applications to reach international markets
 
  •  TQt Assistant - quickly find the
 help you need
-
  •  qmake - create Makefiles from
+
  •  tqmake - create Makefiles from
 simple platform-independent project files
 
  •  qembed - convert data, e.g. images, into C++ code
 
  •  tqmoc - the Meta Object Compiler
diff --git a/doc/html/toplevel-example.html b/doc/html/toplevel-example.html
index ab5d266c..ded384df 100644
--- a/doc/html/toplevel-example.html
+++ b/doc/html/toplevel-example.html
@@ -213,7 +213,7 @@ this attribute for toplevel window.
 
     To build the example go to the toplevel directory
 (TQTDIR/examples/toplevel) 
 (3) 
-and run qmake to generate the makefile, then use the make tool to
+and run tqmake to generate the makefile, then use the make tool to
 build the library. 
 
 
    
diff --git a/doc/html/tqassistantclient.html b/doc/html/tqassistantclient.html
index bff73642..03c5c82f 100644
--- a/doc/html/tqassistantclient.html
+++ b/doc/html/tqassistantclient.html
@@ -82,7 +82,7 @@ emitted. Similarly when closeAssistant() is called,
 
     This class is not included in the TQt library itself. To use it you
 must link against libtqassistantclient.a (Unix) or tqassistantclient.lib (Windows), which is built into INSTALL/lib
 if you built the TQt tools (INSTALL is the directory where TQt is
-installed). If you use qmake, then you can simply add the following
+installed). If you use tqmake, then you can simply add the following
 line to your pro file:
 
     
             LIBS += -ltqassistantclient
diff --git a/doc/html/qmake-manual-1.html b/doc/html/tqmake-manual-1.html
similarity index 59%
rename from doc/html/qmake-manual-1.html
rename to doc/html/tqmake-manual-1.html
index 32b92148..6c48a7a6 100644
--- a/doc/html/qmake-manual-1.html
+++ b/doc/html/tqmake-manual-1.html
@@ -2,7 +2,7 @@
 
 
 
-Introduction to qmake
+Introduction to tqmake