summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/designer/designer.pro4
-rw-r--r--tools/designer/designer/customwidgeteditor.ui2
-rw-r--r--tools/designer/designer/designer_de.ts2
-rw-r--r--tools/designer/designer/designer_fr.ts2
-rw-r--r--tools/designer/tools/conv2ui/main.cpp6
-rw-r--r--tools/designer/tools/createcw/createcw.pro2
-rw-r--r--tools/designer/tools/createcw/main.cpp4
-rw-r--r--tools/linguist/book/linguist-manager.leaf2
-rw-r--r--tools/linguist/linguist.pro2
-rw-r--r--tools/linguist/qm2ts/main.cpp12
-rw-r--r--tools/linguist/qm2ts/qm2ts.116
-rw-r--r--tools/linguist/qm2ts/qm2ts.pro2
-rw-r--r--tools/makeqpf/main.cpp2
-rwxr-xr-xtools/makeqpf/makeall2
-rw-r--r--tools/makeqpf/makeqpf.pro2
-rw-r--r--tools/mergetr/mergetr.cpp2
-rw-r--r--tools/mergetr/mergetr.pro4
-rw-r--r--tools/msg2qm/msg2qm.cpp2
-rw-r--r--tools/msg2qm/msg2qm.pro4
-rw-r--r--tools/qvfb/README10
-rw-r--r--tools/qvfb/main.cpp2
-rw-r--r--tools/qvfb/qvfb.cpp6
-rw-r--r--tools/qvfb/qvfb.pro6
-rw-r--r--tools/qvfb/qvfbratedlg.cpp2
-rw-r--r--tools/qvfb/qvfbview.cpp4
-rw-r--r--tools/qvfb/skin.cpp4
-rw-r--r--tools/tools.pro6
27 files changed, 57 insertions, 57 deletions
diff --git a/tools/designer/designer.pro b/tools/designer/designer.pro
index 337bbb4..bbe68ad 100644
--- a/tools/designer/designer.pro
+++ b/tools/designer/designer.pro
@@ -6,8 +6,8 @@ SUBDIRS = uic \
uilib \
designer \
app \
- tools/createcw \
- tools/conv2ui
+ tools/tqtcreatecw \
+ tools/tqtconv2ui
dll:SUBDIRS *= editor plugins
shared:SUBDIRS *= editor plugins
diff --git a/tools/designer/designer/customwidgeteditor.ui b/tools/designer/designer/customwidgeteditor.ui
index 6f025fc..127ab4a 100644
--- a/tools/designer/designer/customwidgeteditor.ui
+++ b/tools/designer/designer/customwidgeteditor.ui
@@ -186,7 +186,7 @@
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Load Descriptions&lt;/b&gt;&lt;p&gt;Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.&lt;/p&gt;
-&lt;p&gt;Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory&lt;/p&gt;</string>
+&lt;p&gt;Since it is a lot of work to type in all the information for custom widgets, you should consider using the tqtcreatecw tool which is in $QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the tqtcreatecw directory&lt;/p&gt;</string>
</property>
</widget>
<widget class="QPushButton" row="4" column="1">
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index 64f3cf3..f2c55cf 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -424,7 +424,7 @@ so it is not possible to rename it to this name.</source>
</message>
<message encoding="UTF-8">
<source>&lt;b&gt;Load Descriptions&lt;/b&gt;&lt;p&gt;Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.&lt;/p&gt;
-&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
+&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool tqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index 64f3cf3..f2c55cf 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -424,7 +424,7 @@ so it is not possible to rename it to this name.</source>
</message>
<message encoding="UTF-8">
<source>&lt;b&gt;Load Descriptions&lt;/b&gt;&lt;p&gt;Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.&lt;/p&gt;
-&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
+&lt;p&gt;As it is a lot of work to type in all the information for custom widgets, you should check the tool tqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp
index 7ede6c7..2859c3a 100644
--- a/tools/designer/tools/conv2ui/main.cpp
+++ b/tools/designer/tools/conv2ui/main.cpp
@@ -137,11 +137,11 @@ QString Conv2ui::absName( const QString & filename )
void printHelpMessage( QStringList & formats )
{
- printf( "Usage: conv2ui [options] <file> <destination directory>\n\n" );
+ printf( "Usage: tqtconv2ui [options] <file> <destination directory>\n\n" );
printf( "Options:\n");
printf( "\t-help\t\tDisplay this information\n" );
printf( "\t-silent\t\tDon't write any messages\n");
- printf( "\t-version\tDisplay version of conv2ui\n");
+ printf( "\t-version\tDisplay version of tqtconv2ui\n");
printf( "Supported file formats:\n" );
for ( QStringList::Iterator it = formats.begin(); it != formats.end(); ++it )
printf( "\t%s\n", (*it).latin1() );
@@ -201,7 +201,7 @@ int main( int argc, char ** argv )
if ( !silent ) {
printf( "Qt user interface file converter.\n" );
if ( unrecognized ) {
- printf( "conv2ui: Unrecognized option\n" );
+ printf( "tqtconv2ui: Unrecognized option\n" );
}
}
if ( version ) {
diff --git a/tools/designer/tools/createcw/createcw.pro b/tools/designer/tools/createcw/createcw.pro
index 415c0be..875a2e7 100644
--- a/tools/designer/tools/createcw/createcw.pro
+++ b/tools/designer/tools/createcw/createcw.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
CONFIG += qt warn_on release
HEADERS =
SOURCES = main.cpp
-TARGET = createcw
+TARGET = tqtcreatecw
target.path = $$bins.path
INSTALLS += target
diff --git a/tools/designer/tools/createcw/main.cpp b/tools/designer/tools/createcw/main.cpp
index 78f8562..3322ee6 100644
--- a/tools/designer/tools/createcw/main.cpp
+++ b/tools/designer/tools/createcw/main.cpp
@@ -172,8 +172,8 @@ int main( int argc, char **argv )
//
// After that compile the program, link it with your custom widget
// (library or object file) and run it like this:
- // (unix): ./createcw mywidgets.cw
- // (win32): createcw mywidgets.cw
+ // (unix): ./tqtcreatecw mywidgets.cw
+ // (win32): tqtcreatecw mywidgets.cw
//
// After that you can import this description file into the Qt
// Designer using the Custom-Widget Dialog (See
diff --git a/tools/linguist/book/linguist-manager.leaf b/tools/linguist/book/linguist-manager.leaf
index aa99e01..c35aa1a 100644
--- a/tools/linguist/book/linguist-manager.leaf
+++ b/tools/linguist/book/linguist-manager.leaf
@@ -6,7 +6,7 @@ Two tools are provided for the release manager, \l lupdate and \l
lrelease. These tools depend on \e qmake project files. You don't
have to use \e qmake, though.
-A third tool, \c qm2ts, can be used for converting Qt 2.x message
+A third tool, \c tqm2ts, can be used for converting Qt 2.x message
files to \c .ts files.
\section1 Qt Project Files
diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro
index 3f1f286..d34c386 100644
--- a/tools/linguist/linguist.pro
+++ b/tools/linguist/linguist.pro
@@ -5,7 +5,7 @@ SUBDIRS = linguist \
tutorial/tt3 \
lrelease \
lupdate \
- qm2ts
+ tqm2ts
CONFIG += ordered
REQUIRES=full-config nocrosscompiler
diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp
index e04c99c..3cd00ca 100644
--- a/tools/linguist/qm2ts/main.cpp
+++ b/tools/linguist/qm2ts/main.cpp
@@ -42,13 +42,13 @@ typedef QValueList<QTranslatorMessage> TML;
static void printUsage()
{
fprintf( stderr, "Usage:\n"
- " qm2ts [ options ] qm-files\n"
+ " tqm2ts [ options ] qm-files\n"
"Options:\n"
" -help Display this information and exit\n"
" -verbose\n"
" Explain what is being done\n"
" -version\n"
- " Display the version of qm2ts and exit\n" );
+ " Display the version of tqm2ts and exit\n" );
}
int main( int argc, char **argv )
@@ -64,7 +64,7 @@ int main( int argc, char **argv )
verbose = TRUE;
continue;
} else if ( qstrcmp(argv[i], "-version") == 0 ) {
- fprintf( stderr, "qm2ts version %s\n", QT_VERSION_STR );
+ fprintf( stderr, "tqm2ts version %s\n", QT_VERSION_STR );
return 0;
}
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
if ( !metator.save(g) ) {
fprintf( stderr,
- "qm2ts warning: For some reason, I cannot save '%s'\n",
+ "tqm2ts warning: For some reason, I cannot save '%s'\n",
g.latin1() );
} else {
if ( verbose ) {
@@ -109,13 +109,13 @@ int main( int argc, char **argv )
}
if ( ignored > 0 )
fprintf( stderr,
- "qm2ts warning: File '%s' is not a Qt 2.x .qm"
+ "tqm2ts warning: File '%s' is not a Qt 2.x .qm"
" file (some information is lost)\n",
argv[i] );
}
} else {
fprintf( stderr,
- "qm2ts warning: For some reason, I cannot load '%s'\n",
+ "tqm2ts warning: For some reason, I cannot load '%s'\n",
argv[i] );
}
}
diff --git a/tools/linguist/qm2ts/qm2ts.1 b/tools/linguist/qm2ts/qm2ts.1
index e1eb472..bf49ca8 100644
--- a/tools/linguist/qm2ts/qm2ts.1
+++ b/tools/linguist/qm2ts/qm2ts.1
@@ -1,4 +1,4 @@
-.TH qm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH tqm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
.\"
.\" Copyright (C) 2001-2008 Trolltech ASA. All rights reserved.
.\"
@@ -6,9 +6,9 @@
.\" the terms and conditions described in the LICENSE file.
.\"
.SH NAME
-qm2ts \- generate Qt Linguist translation files from Qt 2.x message files
+tqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
.SH SYNOPSIS
-.B qm2ts
+.B tqm2ts
.RI "[ " options " ] " qm-files
.SH DESCRIPTION
This page documents the
@@ -25,13 +25,13 @@ used with version control systems if required. It is understood by
and
.B Qt Linguist.
.PP
-.B qm2ts
+.B tqm2ts
is provided to ease porting from the old internationalization
tools
-.B (findtr,
-.B mergetr
+.B (tqtfindtr,
+.B tqtmergetr
and
-.B msg2qm)
+.B msg2tqm)
to the new ones. It will not accept Qt message files generated by
.B lrelease,
as
@@ -47,7 +47,7 @@ Explain what is being done.
.TP
.I "-version"
Display the version of
-.B qm2ts
+.B tqm2ts
and exit.
.SH "SEE ALSO"
.BR http://doc.trolltech.com/i18n.html
diff --git a/tools/linguist/qm2ts/qm2ts.pro b/tools/linguist/qm2ts/qm2ts.pro
index 3868e30..4d1ee8e 100644
--- a/tools/linguist/qm2ts/qm2ts.pro
+++ b/tools/linguist/qm2ts/qm2ts.pro
@@ -7,7 +7,7 @@ SOURCES = main.cpp \
DEFINES += QT_INTERNAL_XML
include( ../../../src/qt_professional.pri )
-TARGET = qm2ts
+TARGET = tqm2ts
INCLUDEPATH += ../shared
DESTDIR = ../../../bin
diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp
index 0dceee3..8734d5a 100644
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
@@ -242,7 +242,7 @@ private slots:
static void usage()
{
- qWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]");
+ qWarning("Usage: maketqpf [-A] [-f spec-file] [font ...]");
qWarning("");
qWarning(" Saves QPF font files by rendering and saving fonts.");
qWarning("");
diff --git a/tools/makeqpf/makeall b/tools/makeqpf/makeall
index cd5008c..bb167f3 100755
--- a/tools/makeqpf/makeall
+++ b/tools/makeqpf/makeall
@@ -1,4 +1,4 @@
for dpy in LinuxFb Transformed:Rot90 Transformed:Rot180 Transformed:Rot270
do
- QWS_DISPLAY=$dpy ./makeqpf
+ QWS_DISPLAY=$dpy ./maketqpf
done
diff --git a/tools/makeqpf/makeqpf.pro b/tools/makeqpf/makeqpf.pro
index 8a61af6..2fa9d75 100644
--- a/tools/makeqpf/makeqpf.pro
+++ b/tools/makeqpf/makeqpf.pro
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release
HEADERS =
SOURCES = main.cpp
INTERFACES =
-TARGET = makeqpf
+TARGET = maketqpf
REQUIRES=full-config nocrosscompiler
target.path = $$bins.path
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp
index 8588b3c..6061aac 100644
--- a/tools/mergetr/mergetr.cpp
+++ b/tools/mergetr/mergetr.cpp
@@ -1,7 +1,7 @@
/**********************************************************************
** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved.
**
-** This is a utility program for merging findtr msgfiles
+** This is a utility program for merging tqtfindtr msgfiles
**
** This file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free
diff --git a/tools/mergetr/mergetr.pro b/tools/mergetr/mergetr.pro
index 4fbdae1..57b34d3 100644
--- a/tools/mergetr/mergetr.pro
+++ b/tools/mergetr/mergetr.pro
@@ -1,8 +1,8 @@
TEMPLATE = app
CONFIG += console qt warn_on release
HEADERS =
-SOURCES = mergetr.cpp
-TARGET = mergetr
+SOURCES = tqtmergetr.cpp
+TARGET = tqtmergetr
REQUIRES=full-config nocrosscompiler
target.path = $$bins.path
diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp
index 6ac8c36..d2a1c80 100644
--- a/tools/msg2qm/msg2qm.cpp
+++ b/tools/msg2qm/msg2qm.cpp
@@ -1,7 +1,7 @@
/**********************************************************************
** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved.
**
-** This is a utility program for converting findtr msgfiles to
+** This is a utility program for converting tqtfindtr msgfiles to
** qtranslator message files
**
** This file may be used under the terms of the GNU General
diff --git a/tools/msg2qm/msg2qm.pro b/tools/msg2qm/msg2qm.pro
index f81f03e..a92f5b9 100644
--- a/tools/msg2qm/msg2qm.pro
+++ b/tools/msg2qm/msg2qm.pro
@@ -2,8 +2,8 @@ TEMPLATE = app
DEPENDPATH = ../../include
CONFIG += console qt warn_on release
HEADERS =
-SOURCES = msg2qm.cpp
-TARGET = msg2qm
+SOURCES = msg2tqm.cpp
+TARGET = msg2tqm
REQUIRES=full-config nocrosscompiler
target.path = $$bins.path
diff --git a/tools/qvfb/README b/tools/qvfb/README
index c627041..5f35b26 100644
--- a/tools/qvfb/README
+++ b/tools/qvfb/README
@@ -1,7 +1,7 @@
Qt/Embedded Virtual Framebuffer
===============================
-Please note that the qvfb program needs to be compiled with the X11 version
+Please note that the tqvfb program needs to be compiled with the X11 version
of Qt.
The virtual frame buffer allows a Qt/Embedded program to be developed on your
@@ -16,20 +16,20 @@ framebuffer.
To use the virtual framebuffer:
1. Ensure QT_NO_QWS_VFB is not set in qconfig.h (when you configure Qt,
- add the -qvfb option).
-2. Start qvfb (qvfb should be compiled as a normal Qt/X11 application,
+ add the -tqvfb option).
+2. Start tqvfb (tqvfb should be compiled as a normal Qt/X11 application,
NOT as a Qt/Embedded application!).
3. Start a Qt/Embedded server (i.e. construct QApplication with
QApplication::GuiServer flag, or run a client with the -qws option).
-qvfb supports the following command line options:
+tqvfb supports the following command line options:
[-width width] the width of the virtual framebuffer (default: 240).
[-height height] the height of the virtual framebuffer (default: 320).
[-depth depth] the depth of the virtual framebuffer (1,4,8 or 32, default: 8).
[-nocursor] do not display the X11 cursor in the framebuffer window.
[-qwsdisplay] the Qt/Embedded display ID, e.g. -qwsdisplay :1 (default :0).
-[-skin skinfile] tells qvfb to load a skin file, e.g. -skin pda.skin
+[-skin skinfile] tells tqvfb to load a skin file, e.g. -skin pda.skin
Please refer to the file "pda.skin" for an example of what a skin file looks like.
The format for skin files is:
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp
index 50e11ec..dd25031 100644
--- a/tools/qvfb/main.cpp
+++ b/tools/qvfb/main.cpp
@@ -31,7 +31,7 @@
**
**********************************************************************/
-#include "qvfb.h"
+#include "tqvfb.h"
#include <qapplication.h>
#include <qpainter.h>
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 1be15f8..9483177 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -31,9 +31,9 @@
**
**********************************************************************/
-#include "qvfb.h"
-#include "qvfbview.h"
-#include "qvfbratedlg.h"
+#include "tqvfb.h"
+#include "tqvfbview.h"
+#include "tqvfbratedlg.h"
#include "config.h"
#include "skin.h"
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index 7896e7c..33e6a3f 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -1,11 +1,11 @@
TEMPLATE = app
CONFIG += qt warn_on release
-HEADERS = qvfb.h qvfbview.h qvfbratedlg.h qanimationwriter.h \
+HEADERS = tqvfb.h tqvfbview.h tqvfbratedlg.h qanimationwriter.h \
gammaview.h skin.h
-SOURCES = qvfb.cpp qvfbview.cpp qvfbratedlg.cpp \
+SOURCES = tqvfb.cpp tqvfbview.cpp tqvfbratedlg.cpp \
main.cpp qanimationwriter.cpp skin.cpp
INTERFACES = config.ui
IMAGES = images/logo.png
-TARGET = qvfb
+TARGET = tqvfb
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng $$QT_SOURCE_TREE/src/3rdparty/zlib
DEPENDPATH = ../../include
diff --git a/tools/qvfb/qvfbratedlg.cpp b/tools/qvfb/qvfbratedlg.cpp
index 65c0fe2..159d241 100644
--- a/tools/qvfb/qvfbratedlg.cpp
+++ b/tools/qvfb/qvfbratedlg.cpp
@@ -31,7 +31,7 @@
**
**********************************************************************/
-#include "qvfbratedlg.h"
+#include "tqvfbratedlg.h"
#include <qlayout.h>
#include <qlabel.h>
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 32ac3d9..7afc2fc 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -40,8 +40,8 @@
#include "qlock_p.h"
#endif
-#include "qvfbview.h"
-#include "qvfbhdr.h"
+#include "tqvfbview.h"
+#include "tqvfbhdr.h"
#define QTE_PIPE "QtEmbedded-%1"
diff --git a/tools/qvfb/skin.cpp b/tools/qvfb/skin.cpp
index 6322750..955b4c0 100644
--- a/tools/qvfb/skin.cpp
+++ b/tools/qvfb/skin.cpp
@@ -32,8 +32,8 @@
**********************************************************************/
#include "skin.h"
-#include "qvfb.h"
-#include "qvfbview.h"
+#include "tqvfb.h"
+#include "tqvfbview.h"
#include <qbitmap.h>
#include <qpixmap.h>
diff --git a/tools/tools.pro b/tools/tools.pro
index e10c970..a790d71 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -7,10 +7,10 @@ no-png {
assistant \
linguist
unix:SUBDIRS += qtconfig \
- mergetr \
+ tqtmergetr \
qconfig \
- makeqpf \
- msg2qm \
+ maketqpf \
+ msg2tqm \
qembed
}