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

12 files changed, 12 insertions, 12 deletions

diff --git a/examples/qmake/precompile/main.cpp b/examples/qmake/precompile/main.cpp
index 92b5f9886c..d6dc803dfd 100644
--- a/examples/qmake/precompile/main.cpp
+++ b/examples/qmake/precompile/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 examples of the Qt Toolkit.
diff --git a/examples/qmake/precompile/mydialog.cpp b/examples/qmake/precompile/mydialog.cpp
index f4bd33e0c7..66fee407cf 100644
--- a/examples/qmake/precompile/mydialog.cpp
+++ b/examples/qmake/precompile/mydialog.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/precompile/mydialog.h b/examples/qmake/precompile/mydialog.h
index dc6101d0fc..e3eef8ff05 100644
--- a/examples/qmake/precompile/mydialog.h
+++ b/examples/qmake/precompile/mydialog.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/precompile/myobject.cpp b/examples/qmake/precompile/myobject.cpp
index 1c98d4ada3..a9ad50245e 100644
--- a/examples/qmake/precompile/myobject.cpp
+++ b/examples/qmake/precompile/myobject.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/precompile/myobject.h b/examples/qmake/precompile/myobject.h
index 026080b014..510bb791eb 100644
--- a/examples/qmake/precompile/myobject.h
+++ b/examples/qmake/precompile/myobject.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/precompile/stable.h b/examples/qmake/precompile/stable.h
index 5fc4624b33..eef8cef728 100644
--- a/examples/qmake/precompile/stable.h
+++ b/examples/qmake/precompile/stable.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/precompile/util.cpp b/examples/qmake/precompile/util.cpp
index 3a420dced4..c59a720282 100644
--- a/examples/qmake/precompile/util.cpp
+++ b/examples/qmake/precompile/util.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/tutorial/hello.cpp b/examples/qmake/tutorial/hello.cpp
index 9a12a68ae1..1d79b13fab 100644
--- a/examples/qmake/tutorial/hello.cpp
+++ b/examples/qmake/tutorial/hello.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/tutorial/hello.h b/examples/qmake/tutorial/hello.h
index c4aeed74d7..384445c512 100644
--- a/examples/qmake/tutorial/hello.h
+++ b/examples/qmake/tutorial/hello.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/tutorial/hellounix.cpp b/examples/qmake/tutorial/hellounix.cpp
index 6c4836f5b3..fd2d57ecc6 100644
--- a/examples/qmake/tutorial/hellounix.cpp
+++ b/examples/qmake/tutorial/hellounix.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/tutorial/hellowin.cpp b/examples/qmake/tutorial/hellowin.cpp
index 2ced6dff13..bee4095122 100644
--- a/examples/qmake/tutorial/hellowin.cpp
+++ b/examples/qmake/tutorial/hellowin.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 examples of the Qt Toolkit.
diff --git a/examples/qmake/tutorial/main.cpp b/examples/qmake/tutorial/main.cpp
index 9c256fb09a..25cf51e8f5 100644
--- a/examples/qmake/tutorial/main.cpp
+++ b/examples/qmake/tutorial/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 examples of the Qt Toolkit.