Changeset 561 for trunk/tools/assistant/compat/helpdialog.ui

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/assistant/compat/helpdialog.ui (modified) (6 diffs)

trunk/tools/assistant/compat/helpdialog.ui

@@ -4 +4 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -23 +24 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -36 +36 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -270 +270 @@
         <widget class="QLineEdit" name="termsEdit" >
          <property name="toolTip" >
-          <string>Enter searchword(s).</string>
+          <string>Enter searchword(s)</string>
          </property>
          <property name="whatsThis" >
@@ -308 +308 @@
           <widget class="QPushButton" name="helpButton" >
            <property name="toolTip" >
-            <string>Display the help page.</string>
+            <string>Display the help page</string>
            </property>
            <property name="whatsThis" >
@@ -337 +337 @@
           <widget class="QPushButton" name="searchButton" >
            <property name="toolTip" >
-            <string>Start searching.</string>
+            <string>Start searching</string>
            </property>
            <property name="whatsThis" >