Changeset 846 for trunk/tools/activeqt/testcon

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/ambientproperties.cpp (modified) (1 diff)
• tools/activeqt/testcon/ambientproperties.h (modified) (1 diff)
• tools/activeqt/testcon/ambientproperties.ui (modified) (1 diff)
• tools/activeqt/testcon/changeproperties.cpp (modified) (3 diffs)
• tools/activeqt/testcon/changeproperties.h (modified) (1 diff)
• tools/activeqt/testcon/changeproperties.ui (modified) (1 diff)
• tools/activeqt/testcon/controlinfo.cpp (modified) (1 diff)
• tools/activeqt/testcon/controlinfo.h (modified) (1 diff)
• tools/activeqt/testcon/controlinfo.ui (modified) (1 diff)
• tools/activeqt/testcon/docuwindow.cpp (modified) (1 diff)
• tools/activeqt/testcon/docuwindow.h (modified) (1 diff)
• tools/activeqt/testcon/invokemethod.cpp (modified) (1 diff)
• tools/activeqt/testcon/invokemethod.h (modified) (1 diff)
• tools/activeqt/testcon/invokemethod.ui (modified) (1 diff)
• tools/activeqt/testcon/main.cpp (modified) (1 diff)
• tools/activeqt/testcon/mainwindow.cpp (modified) (1 diff)
• tools/activeqt/testcon/mainwindow.h (modified) (1 diff)
• tools/activeqt/testcon/mainwindow.ui (modified) (1 diff)
• tools/activeqt/testcon/scripts/perlscript.pl (modified) (1 diff)
• tools/activeqt/testcon/scripts/pythonscript.py (modified) (1 diff)
• tools/activeqt/testcon/testcon.pro (modified) (1 diff)
• tools/activeqt/testcon/testcon.rc (modified) (1 diff)

trunk/tools/activeqt/testcon/ambientproperties.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])

trunk/tools/activeqt/testcon/ambientproperties.h

@@ -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])

trunk/tools/activeqt/testcon/ambientproperties.ui

@@ -3 +3 @@
  <comment>*********************************************************************
 **
-** 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])

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()));
             }
         }

trunk/tools/activeqt/testcon/changeproperties.h

@@ -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])

trunk/tools/activeqt/testcon/changeproperties.ui

@@ -3 +3 @@
  <comment>*********************************************************************
 **
-** 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])

trunk/tools/activeqt/testcon/controlinfo.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])

trunk/tools/activeqt/testcon/controlinfo.h

@@ -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])

trunk/tools/activeqt/testcon/controlinfo.ui

@@ -3 +3 @@
  <comment>*********************************************************************
 **
-** 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])

trunk/tools/activeqt/testcon/docuwindow.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])

trunk/tools/activeqt/testcon/docuwindow.h

@@ -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])

trunk/tools/activeqt/testcon/invokemethod.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])

trunk/tools/activeqt/testcon/invokemethod.h

@@ -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])

trunk/tools/activeqt/testcon/invokemethod.ui

@@ -3 +3 @@
  <comment>*********************************************************************
 **
-** 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])

trunk/tools/activeqt/testcon/main.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])

trunk/tools/activeqt/testcon/mainwindow.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])

trunk/tools/activeqt/testcon/mainwindow.h

@@ -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])

trunk/tools/activeqt/testcon/mainwindow.ui

@@ -3 +3 @@
  <comment>*********************************************************************
 **
-** 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])

trunk/tools/activeqt/testcon/scripts/perlscript.pl

@@ -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])

trunk/tools/activeqt/testcon/scripts/pythonscript.py

@@ -2 +2 @@
 #############################################################################
 ##
-## 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])

trunk/tools/activeqt/testcon/testcon.pro

@@ -17 +17 @@
     QMAKE_POST_LINK = -midl $$QT_SOURCE_TREE/tools/activeqt/testcon/testcon.idl
 } else {
-    !win32-g++:QMAKE_POST_LINK = midl $$QT_SOURCE_TREE/tools/activeqt/testcon/testcon.idl && move testcon.tlb $(TARGETDIR)
+    !win32-g++:QMAKE_POST_LINK = midl $$QT_SOURCE_TREE/tools/activeqt/testcon/testcon.idl && move testcon.tlb $(TARGETDIR)
 
 }

trunk/tools/activeqt/testcon/testcon.rc

@@ -24 +24 @@
                                 VALUE "FileVersion", "1,0,0,1\0"
                                 VALUE "InternalName", "testcon\0"
-                                VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).0"
+                                VALUE "LegalCopyright", "Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).0"
                                 VALUE "LegalTrademarks", "\0"
                                 VALUE "OriginalFilename", "testcon.exe\0"