Changeset 846 for trunk/tools/pixeltool

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/pixeltool/main.cpp (modified) (1 diff)
• tools/pixeltool/qpixeltool.cpp (modified) (2 diffs)
• tools/pixeltool/qpixeltool.h (modified) (1 diff)

trunk/tools/pixeltool/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/pixeltool/qpixeltool.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])
@@ -357 +357 @@
     freeze.setChecked(tmpFreeze);
     freeze.setShortcut(QKeySequence(Qt::Key_Space));
-    QAction autoUpdate(QLatin1String("Continous update"), &menu);
+    QAction autoUpdate(QLatin1String("Continous update"), &menu);
     autoUpdate.setCheckable(true);
     autoUpdate.setChecked(m_autoUpdate);

trunk/tools/pixeltool/qpixeltool.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])