diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
| commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
| tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /examples/widgets/tools/undo | |
| parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'examples/widgets/tools/undo')
| -rw-r--r-- | examples/widgets/tools/undo/commands.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/undo/commands.h | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/undo/document.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/undo/document.h | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/undo/main.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/undo/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/undo/mainwindow.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/tools/undo/commands.cpp b/examples/widgets/tools/undo/commands.cpp index ee299bc3af..c735eaef8c 100644 --- a/examples/widgets/tools/undo/commands.cpp +++ b/examples/widgets/tools/undo/commands.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. diff --git a/examples/widgets/tools/undo/commands.h b/examples/widgets/tools/undo/commands.h index 23dde1c81c..b8984c1d34 100644 --- a/examples/widgets/tools/undo/commands.h +++ b/examples/widgets/tools/undo/commands.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. diff --git a/examples/widgets/tools/undo/document.cpp b/examples/widgets/tools/undo/document.cpp index 5970ab72a1..833e70f7d4 100644 --- a/examples/widgets/tools/undo/document.cpp +++ b/examples/widgets/tools/undo/document.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. diff --git a/examples/widgets/tools/undo/document.h b/examples/widgets/tools/undo/document.h index 1c18e02aa1..4f362a9597 100644 --- a/examples/widgets/tools/undo/document.h +++ b/examples/widgets/tools/undo/document.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. diff --git a/examples/widgets/tools/undo/main.cpp b/examples/widgets/tools/undo/main.cpp index b62e1aca75..e6197e3fa2 100644 --- a/examples/widgets/tools/undo/main.cpp +++ b/examples/widgets/tools/undo/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. diff --git a/examples/widgets/tools/undo/mainwindow.cpp b/examples/widgets/tools/undo/mainwindow.cpp index 22cea1dbbf..93cb768433 100644 --- a/examples/widgets/tools/undo/mainwindow.cpp +++ b/examples/widgets/tools/undo/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. diff --git a/examples/widgets/tools/undo/mainwindow.h b/examples/widgets/tools/undo/mainwindow.h index 3218c889e4..83a86a63b8 100644 --- a/examples/widgets/tools/undo/mainwindow.h +++ b/examples/widgets/tools/undo/mainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. |