Changeset 846 for trunk/tools/activeqt/testcon/changeproperties.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/activeqt/testcon/changeproperties.cpp (modified) (3 diffs)

trunk/tools/activeqt/testcon/changeproperties.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -112 +112 @@
             } else {
                 QMessageBox::warning(this, tr("Can't parse input"), 
-                                            QString(tr("Failed to create a color from %1\n"
+                                           tr("Failed to create a color from %1\n"
                                                         "The string has to be a valid color name (e.g. 'red')\n"
                                                         "or a RGB triple of format '#rrggbb'."
-                                                        ).arg(editValue->text())));
+                                                        ).arg(editValue->text()));
             }
         }
@@ -126 +126 @@
             } else {
                 QMessageBox::warning(this, tr("Can't parse input"), 
-                                            (tr("Failed to create a font from %1\n"
+                                           tr("Failed to create a font from %1\n"
                                                 "The string has to have a format family,<point size> or\n"
                                                 "family,pointsize,stylehint,weight,italic,underline,strikeout,fixedpitch,rawmode."
-                                                        ).arg(editValue->text())));
+                                                        ).arg(editValue->text()));
             }
         }