diff --git a/bin/findtr b/bin/findtr index c7b82d1..7df3325 100755 --- a/bin/findtr +++ b/bin/findtr @@ -37,7 +37,7 @@ msgstr "" $scope = ""; if ( $#ARGV < 0 ) { - print STDERR "Usage: tqtfindtr sourcefile ... >project.po\n"; + print STDERR "Usage: findtr sourcefile ... >project.po\n"; exit 1; } diff --git a/bin/qt20fix b/bin/qt20fix index 9fc7f9e..d7cba30 100755 --- a/bin/qt20fix +++ b/bin/qt20fix @@ -1,14 +1,14 @@ #!/usr/bin/perl -w # # in sh/bash/zsh: -# make 2>&1 | .../qt/bin/tqt20fix +# make 2>&1 | .../qt/bin/qt20fix # in csh/tcsh -# make |& .../qt/bin/tqt20fix +# make |& .../qt/bin/qt20fix # -# repeat as long as tqt20fix says to. if your make supports the -k +# repeat as long as qt20fix says to. if your make supports the -k # flag, that speeds up the process a bit. # -# tqt20fix tends to fix a bit over half of the remaining problems in +# qt20fix tends to fix a bit over half of the remaining problems in # each run. # # if you don't use gcc, you will need to change parseline. @@ -222,7 +222,7 @@ while( ) { if ( defined( $lastfile ) ) { open( O, "> $lastfile" ) || die "cannot write to $lastfile, stopped"; - print "tqt20fix: writing $lastfile (changes: $changes)\n"; + print "qt20fix: writing $lastfile (changes: $changes)\n"; print O @currentfile; close O; } @@ -248,12 +248,12 @@ while( ) { if ( defined( $changes) && $changes > 0 && defined( $lastfile ) ) { open( O, "> $lastfile" ) || die "cannot write to $lastfile, stopped"; - print "tqt20fix: writing $lastfile (changes: $changes)\n"; + print "qt20fix: writing $lastfile (changes: $changes)\n"; print O @currentfile; close O; } if ( defined( $totalchanges) && $totalchanges > 0 ) { - print "tqt20fix: total changes: $totalchanges\ntqt20fix: rerun recommended\n"; + print "qt20fix: total changes: $totalchanges\nqt20fix: rerun recommended\n"; } diff --git a/configure b/configure index 9d33b07..6032cc7 100755 --- a/configure +++ b/configure @@ -226,7 +226,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-tqvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-xshape|-tablet|-pch|-stl|-ipv6|-freetype|-big-codecs|-xcursor|-xrandr|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-version-script|-dlopen-opengl|-glibmainloop) + -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-xshape|-tablet|-pch|-stl|-ipv6|-freetype|-big-codecs|-xcursor|-xrandr|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-version-script|-dlopen-opengl|-glibmainloop) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -405,9 +405,9 @@ while [ "$#" -gt 0 ]; do depths) CFG_QWS_DEPTHS="$VAL" ;; - tqvfb) # left for commandline compatibility, not documented + qvfb) # left for commandline compatibility, not documented if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - [ "$VAL" = "yes" ] && QMAKE_VARS="$QMAKE_VARS \"gfx-drivers += tqvfb\"" + [ "$VAL" = "yes" ] && QMAKE_VARS="$QMAKE_VARS \"gfx-drivers += qvfb\"" else UNKNOWN_OPT=yes fi diff --git a/doc/html/emb-fonts.html b/doc/html/emb-fonts.html index 234c53f..6583963 100644 --- a/doc/html/emb-fonts.html +++ b/doc/html/emb-fonts.html @@ -61,7 +61,7 @@ enabled) can be enabled or disabled independently by using the tools/maketqpf for a tool that helps +

See tools/makeqpf for a tool that helps produce QPF files from the TTF and BDF, or just run your application with the -savefonts option.

Memory Requirements @@ -151,7 +151,7 @@ generate all 4 rotations of fonts would be to run the following at a real frameb 
 for dpy in LinuxFb Transformed:Rot90 Transformed:Rot180 Transformed:Rot270
 do
-    QWS_DISPLAY=$dpy ./maketqpf "$@"
+    QWS_DISPLAY=$dpy ./makeqpf "$@"
 done

If programs are only ever run in one orientation on a device, only the one appropriate set of fonts is needed. diff --git a/doc/html/emb-install.html b/doc/html/emb-install.html index d04a04a..47ae22a 100644 --- a/doc/html/emb-install.html +++ b/doc/html/emb-install.html @@ -144,7 +144,7 @@ named pipe /tmp/qtembedded-username/QtEmbedded-0; sometimes it may need

The Qt/Embedded library can be reduced in size by removing unnecessary features.

  • This document shows how to use Qt/Embedded with the Linux framebuffer. For -development and debugging purposes it is often easier to use the Qt/Embedded virtual framebuffer instead. +development and debugging purposes it is often easier to use the Qt/Embedded virtual framebuffer instead.

    diff --git a/doc/html/emb-qvfb.html b/doc/html/emb-qvfb.html index c2a301e..df971cc 100644 --- a/doc/html/emb-qvfb.html +++ b/doc/html/emb-qvfb.html @@ -1,5 +1,5 @@ - + @@ -34,17 +34,17 @@ body { background: #ffffff; color: black; }

    The virtual framebuffer allows Qt/Embedded programs to be developed on a desktop machine, without switching between consoles and X11. -

    The virtual framebuffer is located in $QTDIR/tools/tqvfb. +

    The virtual framebuffer is located in $QTDIR/tools/qvfb.

    Using the Virtual Framebuffer

      -
    1. Configure Qt/Embedded with the -tqvfb argument and compile the library: +
    2. Configure Qt/Embedded with the -qvfb argument and compile the library: 
      -    ./configure -tqvfb
+    ./configure -qvfb
     make
      -
    3. Compile tqvfb as a normal Qt/X11 application and run it. Do not +
    4. Compile qvfb as a normal Qt/X11 application and run it. Do not compile it as a Qt/Embedded application.
    5. Start a Qt/Embedded master application (i.e., construct QApplication with the QApplication::GuiServer flag or use the -qws command line parameter). You can specify to the server that @@ -53,13 +53,13 @@ you wish to use the virtual framebuffer driver, e.g.: masterapp -qws -display QVFb:0 -
    6. Qt/Embedded will autodetect tqvfb, so you can omit the -display -command line parameter if you know that tqvfb is running, and that -the Qt/Embedded library supports tqvfb. (If this is not the case, +
    7. Qt/Embedded will autodetect qvfb, so you can omit the -display +command line parameter if you know that qvfb is running, and that +the Qt/Embedded library supports qvfb. (If this is not the case, Qt/Embedded will write to the real framebuffer, and your X11 display will be corrupted.)

    -

    tqvfb supports the following command line options: +

    qvfb supports the following command line options:

    @@ -82,23 +82,23 @@ display will be corrupted.)

    The virtual framebuffer emulates a framebuffer using a shared memory region (the virtual frame buffer) and a utility to display the framebuffer in a -window (tqvfb). The regions of the display that have changed are updated +window (qvfb). The regions of the display that have changed are updated periodically, so you will see discrete snapshots of the framebuffer rather than each individual drawing operation. For this reason drawing problems such as flickering may not be apparent until the program is run using a real framebuffer.

    The target refresh rate can be set via the View|Refresh Rate -menu item. This will cause tqvfb to check for updated regions more +menu item. This will cause qvfb to check for updated regions more frequently. The rate is a target only. If little drawing is being done, the framebuffer will not show any updates between drawing events. If an application is displaying an animation the updates will -be frequent, then the application and tqvfb will compete for +be frequent, then the application and qvfb will compete for processor time.

    Mouse and keyboard events are passed to the Qt/Embedded master process via named pipes.

    The virtual framebuffer is a development tool only. No security issues have been considered in the virtual framebuffer design. It should be avoided -in a production environment; do not configure production libraries with -tqvfb. +in a production environment; do not configure production libraries with -qvfb.

    diff --git a/doc/html/emb-running.html b/doc/html/emb-running.html index 499d99e..fae839b 100644 --- a/doc/html/emb-running.html +++ b/doc/html/emb-running.html @@ -43,7 +43,7 @@ command line option.

    This document assumes you have the Linux framebuffer configured correctly and no master process is running. If you do not have a working Linux framebuffer you can use the -Qt/Embedded virtual framebuffer, or you can +Qt/Embedded virtual framebuffer, or you can run Qt/Embedded as a VNC server.

    Change to a Linux console and select an example to run, e.g. examples/widgets. Make sure $QTDIR is set to the directory where you installed Qt/Embedded and add the $QTDIR/lib directory to diff --git a/doc/html/emb-vnc.html b/doc/html/emb-vnc.html index 8a1a09a..6d88dba 100644 --- a/doc/html/emb-vnc.html +++ b/doc/html/emb-vnc.html @@ -54,7 +54,7 @@ can change this by setting the QWS_SIZE environment variable to another size, e.g. QWS_SIZE=240x320.

    VNC clients are available for a vast array of display systems: X11, Windows, Amiga, DOS, VMS, and dozens of others. -

    The Qt Virtual Framebuffer is an alternative +

    The Qt Virtual Framebuffer is an alternative technique. It uses shared memory and thus is much faster and smoother, but it does not operate over a network.

    diff --git a/doc/html/i18n.html b/doc/html/i18n.html index 3efb156..2b3803a 100644 --- a/doc/html/i18n.html +++ b/doc/html/i18n.html @@ -347,7 +347,7 @@ file for lupdate; your qmake project file will work fine once you add the TRANSLATIONS entry.

    In your application, you must QTranslator::load() the translation files appropriate for the user's language, and install them using QApplication::installTranslator(). -

    If you have been using the old Qt tools (tqtfindtr, msg2tqm and tqtmergetr), you can use tqm2ts to convert your old .qm files. +

    If you have been using the old Qt tools (findtr, msg2qm and mergetr), you can use qm2ts to convert your old .qm files.

    linguist, lupdate and lrelease are installed in the bin subdirectory of the base directory Qt is installed into. Click Help|Manual in Qt Linguist to access the user's manual; it contains a tutorial diff --git a/doc/html/index b/doc/html/index index c98b4c2..cc7ca30 100644 --- a/doc/html/index +++ b/doc/html/index @@ -8140,7 +8140,7 @@ "Qt's Tools" tools-list.html "Qt/Embedded Performance Tuning" emb-performance.html "Qt/Embedded Pointer Handling" emb-pointer.html -"Qt/Embedded Virtual Framebuffer" emb-tqvfb.html +"Qt/Embedded Virtual Framebuffer" emb-qvfb.html "Qt/Embedded as a VNC Server" emb-vnc.html "Qt/Embedded environment variables" emb-envvars.html "Qt/Mac Issues" mac-differences.html @@ -8282,7 +8282,7 @@ "i18n" i18n.html "images" images.html "io" io.html -"maketqpf" maketqpf.html +"makeqpf" makeqpf.html "misc" misc.html "motif-examples" motif-examples.html "multimedia" multimedia.html diff --git a/doc/html/linguist-manual-2.html b/doc/html/linguist-manual-2.html index 79dc168..e95e386 100644 --- a/doc/html/linguist-manual-2.html +++ b/doc/html/linguist-manual-2.html @@ -32,7 +32,7 @@ body { background: #ffffff; color: black; }

    Option Meaning

    [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.

    -

    A third tool, tqm2ts, can be used for converting Qt 2.x message files to .ts files.

    +

    A third tool, qm2ts, can be used for converting Qt 2.x message files to .ts files.

    Qt Project Files

    lupdate and lrelease depend on information in the application's .pro Qt 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 \
diff --git a/doc/html/makeqpf.html b/doc/html/makeqpf.html
index e56614f..54e1c11 100644
--- a/doc/html/makeqpf.html
+++ b/doc/html/makeqpf.html
@@ -1,9 +1,9 @@
 
-
+
 
 
 
-maketqpf
+makeqpf