Changeset 561 for trunk/tools/qconfig/main.cpp

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/qconfig/main.cpp (modified) (5 diffs)

trunk/tools/qconfig/main.cpp

@@ -2 +2 @@
 **
 ** 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 tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** 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
@@ -34 +34 @@
 ** 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$
 **
@@ -172 +172 @@
     textBrowser->show();
 
-    connect(textBrowser, SIGNAL(featureClicked(const QString&)),
-            this, SLOT(showInfo(const QString&)));
+    connect(textBrowser, SIGNAL(featureClicked(QString)),
+            this, SLOT(showInfo(QString)));
     connect(featureTree, SIGNAL(activated(QModelIndex)),
             this, SLOT(showInfo(QModelIndex)));
-    connect(featureModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+    connect(featureModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
             this, SLOT(modelChanged()));
     connect(featureTree, SIGNAL(clicked(QModelIndex)),
@@ -508 +508 @@
         "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
         "<p></p>"
-        "<p>This program is licensed to you under the terms of the GNU General "
-        "Public License Version 2 as published by the Free Software Foundation. This "
-        "gives you legal permission to copy, distribute and/or modify this software "
-        "under certain conditions. For details, see the file 'LICENSE.GPL' that came with "
-        "this software distribution. If you did not get the file, send email to "
-        "qt-info@nokia.com.</p>\n\n<p>The program is provided AS IS with NO WARRANTY "
-        "OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS "
-        "FOR A PARTICULAR PURPOSE.</p>"
     );
 }