diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
| commit | 226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch) | |
| tree | 491c25c4c9f08b6ef732a9179d2e64776a9e8446 /examples/phonon | |
| parent | 84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff) | |
| parent | 59a35a794e433f9526aff72025c0899e76ef362e (diff) | |
| download | Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'examples/phonon')
| -rw-r--r-- | examples/phonon/capabilities/main.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/capabilities/window.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/capabilities/window.h | 2 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/main.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/phonon/capabilities/main.cpp b/examples/phonon/capabilities/main.cpp index 63aa252..94e9cbc 100644 --- a/examples/phonon/capabilities/main.cpp +++ b/examples/phonon/capabilities/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/phonon/capabilities/window.cpp b/examples/phonon/capabilities/window.cpp index b9594fe..39ecf86 100644 --- a/examples/phonon/capabilities/window.cpp +++ b/examples/phonon/capabilities/window.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h index e16154f..ce4e7d3 100644 --- a/examples/phonon/capabilities/window.h +++ b/examples/phonon/capabilities/window.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/phonon/qmusicplayer/main.cpp b/examples/phonon/qmusicplayer/main.cpp index 2f4f0ce..708135f 100644 --- a/examples/phonon/qmusicplayer/main.cpp +++ b/examples/phonon/qmusicplayer/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/phonon/qmusicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp index 0e8e780..b804a72 100644 --- a/examples/phonon/qmusicplayer/mainwindow.cpp +++ b/examples/phonon/qmusicplayer/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/phonon/qmusicplayer/mainwindow.h b/examples/phonon/qmusicplayer/mainwindow.h index cff5256..a96f0c0 100644 --- a/examples/phonon/qmusicplayer/mainwindow.h +++ b/examples/phonon/qmusicplayer/mainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |