diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
| commit | 05c543c75043824e12dac17a55e89bc11e74c7a4 (patch) | |
| tree | 4b9b117084b21dc9a8486befefd2f60c138c1ea4 /tests/manual/windowflags | |
| parent | 7bc18035816a2eac15dfac4d987eb9bf43f90ef6 (diff) | |
| parent | 6b79cbf5cadbaebef8be895a47ca314724afb1a1 (diff) | |
| download | Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.zip Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.gz Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tests/manual/windowflags')
| -rw-r--r-- | tests/manual/windowflags/controllerwindow.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/windowflags/controllerwindow.h | 2 | ||||
| -rw-r--r-- | tests/manual/windowflags/main.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/windowflags/previewwindow.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/windowflags/previewwindow.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index b9eb0db..83cd989 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h index 0e96e13..a246e46 100644 --- a/tests/manual/windowflags/controllerwindow.h +++ b/tests/manual/windowflags/controllerwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/manual/windowflags/main.cpp b/tests/manual/windowflags/main.cpp index f80f307..cfccce5 100644 --- a/tests/manual/windowflags/main.cpp +++ b/tests/manual/windowflags/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp index 31e8b3e..28d9ef8 100644 --- a/tests/manual/windowflags/previewwindow.cpp +++ b/tests/manual/windowflags/previewwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h index fbf822b..a4d5b87 100644 --- a/tests/manual/windowflags/previewwindow.h +++ b/tests/manual/windowflags/previewwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |