summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-05-07 21:58:34 -0500
committerTimothy Pearson <[email protected]>2013-05-07 21:58:34 -0500
commitc740211ffba3330d951f4c3ddefea8edf23a01cd (patch)
tree0a8b7641d3c5b576d18a2f7912c75fc600f494e2 /tools/designer
parent8a4eacb6185de3653f6ae401c352aef833a9e72a (diff)
downloadtqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.tar.gz
tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.zip
Automated update from Qt3
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/designer/designer_de.ts2
-rw-r--r--tools/designer/designer/designer_fr.ts2
-rw-r--r--tools/designer/designer/designerappiface.cpp2
-rw-r--r--tools/designer/designer/mainwindowactions.cpp2
-rw-r--r--tools/designer/plugins/cppeditor/yyreg.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index 5ed9aaaca..64f3cf3f5 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -2237,7 +2237,7 @@ but they are not known to the designer:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a tquick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
+ <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a quick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index 5ed9aaaca..64f3cf3f5 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -2237,7 +2237,7 @@ but they are not known to the designer:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a tquick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
+ <source>&lt;b&gt;The Object Explorer&lt;/b&gt;&lt;p&gt;The object explorer gives a quick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.&lt;/p&gt;&lt;p&gt;The columns can be resized by dragging the separator in the list header.&lt;/p&gt;&lt;p&gt;On the second tab you can see all the declared slots, variables, includes, etc. of the form.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index 98aa69e52..bbcba7784 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -317,7 +317,7 @@ TQString DesignerProjectImpl::customSetting( const TQString &key ) const
{
if ( key == "TQTSCRIPT_PACKAGES" ) {
TQString s = getenv( "TQTSCRIPT_PACKAGES" );
- TQString s2 = project->customSetting( "TQUICK_PACKAGES" );
+ TQString s2 = project->customSetting( "QUICK_PACKAGES" );
if ( !s.isEmpty() && !s2.isEmpty() )
#if defined(Q_OS_WIN32)
s += ";";
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 07d9c3c2f..9fb744b93 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -108,7 +108,7 @@ static const char * whatsthis_image[] = {
" ooo "};
const TQString toolbarHelp = "<p>Toolbars contain a number of buttons to "
-"provide tquick access to often used functions.%1"
+"provide quick access to often used functions.%1"
"<br>Click on the toolbar handle to hide the toolbar, "
"or drag and place the toolbar to a different location.</p>";
diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp
index bec1bd9fb..7cc81ff2f 100644
--- a/tools/designer/plugins/cppeditor/yyreg.cpp
+++ b/tools/designer/plugins/cppeditor/yyreg.cpp
@@ -129,7 +129,7 @@ static void stopTokenizer()
}
/*
- These two macros implement tquick-and-dirty hashing for telling
+ These two macros implement quick-and-dirty hashing for telling
apart keywords fast.
*/
#define HASH( ch, len ) ( (ch) | ((len) << 8) )