diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:58:59 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:59:44 +0100 |
commit | 27cbc14bad01ce78458e3bd42ec8fb6e63e9a48f (patch) | |
tree | c7f7fe88146b44008a6477925402350cfc20fca0 /tools/testcon | |
parent | c4ca96871280f9dd896d62fe5ea3e01b79b106e6 (diff) | |
parent | 7f394bc7c4c61289885101f4d349a0bf573ac11d (diff) | |
download | qtactiveqt-27cbc14bad01ce78458e3bd42ec8fb6e63e9a48f.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I68995b86daa2caaa1806107631edaeb2d8dc66c3
Diffstat (limited to 'tools/testcon')
-rw-r--r-- | tools/testcon/ambientproperties.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/ambientproperties.h | 2 | ||||
-rw-r--r-- | tools/testcon/ambientproperties.ui | 2 | ||||
-rw-r--r-- | tools/testcon/changeproperties.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/changeproperties.h | 2 | ||||
-rw-r--r-- | tools/testcon/changeproperties.ui | 2 | ||||
-rw-r--r-- | tools/testcon/controlinfo.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/controlinfo.h | 2 | ||||
-rw-r--r-- | tools/testcon/controlinfo.ui | 2 | ||||
-rw-r--r-- | tools/testcon/docuwindow.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/docuwindow.h | 2 | ||||
-rw-r--r-- | tools/testcon/invokemethod.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/invokemethod.h | 2 | ||||
-rw-r--r-- | tools/testcon/invokemethod.ui | 2 | ||||
-rw-r--r-- | tools/testcon/main.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/mainwindow.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/mainwindow.h | 2 | ||||
-rw-r--r-- | tools/testcon/mainwindow.ui | 2 | ||||
-rw-r--r-- | tools/testcon/scripts/perlscript.pl | 2 | ||||
-rw-r--r-- | tools/testcon/scripts/pythonscript.py | 2 | ||||
-rw-r--r-- | tools/testcon/testcon.rc | 2 |
21 files changed, 21 insertions, 21 deletions
diff --git a/tools/testcon/ambientproperties.cpp b/tools/testcon/ambientproperties.cpp index 47fb72e..0bf6544 100644 --- a/tools/testcon/ambientproperties.cpp +++ b/tools/testcon/ambientproperties.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/ambientproperties.h b/tools/testcon/ambientproperties.h index 14a60ca..8746e31 100644 --- a/tools/testcon/ambientproperties.h +++ b/tools/testcon/ambientproperties.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/ambientproperties.ui b/tools/testcon/ambientproperties.ui index 6a300b8..2bdcfb9 100644 --- a/tools/testcon/ambientproperties.ui +++ b/tools/testcon/ambientproperties.ui @@ -2,7 +2,7 @@ <author></author> <comment>********************************************************************* ** -** 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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp index d523267..41936ef 100644 --- a/tools/testcon/changeproperties.cpp +++ b/tools/testcon/changeproperties.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/changeproperties.h b/tools/testcon/changeproperties.h index 1afb052..af37c3b 100644 --- a/tools/testcon/changeproperties.h +++ b/tools/testcon/changeproperties.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/changeproperties.ui b/tools/testcon/changeproperties.ui index 0f1ca6a..1ecdc9b 100644 --- a/tools/testcon/changeproperties.ui +++ b/tools/testcon/changeproperties.ui @@ -2,7 +2,7 @@ <author></author> <comment>********************************************************************* ** -** 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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/controlinfo.cpp b/tools/testcon/controlinfo.cpp index a338c57..bb7e0f2 100644 --- a/tools/testcon/controlinfo.cpp +++ b/tools/testcon/controlinfo.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/controlinfo.h b/tools/testcon/controlinfo.h index 903958e..f3a6c8c 100644 --- a/tools/testcon/controlinfo.h +++ b/tools/testcon/controlinfo.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/controlinfo.ui b/tools/testcon/controlinfo.ui index d3d7625..e2684ca 100644 --- a/tools/testcon/controlinfo.ui +++ b/tools/testcon/controlinfo.ui @@ -2,7 +2,7 @@ <author></author> <comment>********************************************************************* ** -** 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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/docuwindow.cpp b/tools/testcon/docuwindow.cpp index a57f33e..cdeee74 100644 --- a/tools/testcon/docuwindow.cpp +++ b/tools/testcon/docuwindow.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/docuwindow.h b/tools/testcon/docuwindow.h index 9e89df1..b8aafbc 100644 --- a/tools/testcon/docuwindow.h +++ b/tools/testcon/docuwindow.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp index 8390051..a3f587e 100644 --- a/tools/testcon/invokemethod.cpp +++ b/tools/testcon/invokemethod.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/invokemethod.h b/tools/testcon/invokemethod.h index b6b75f0..a3b76d4 100644 --- a/tools/testcon/invokemethod.h +++ b/tools/testcon/invokemethod.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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/invokemethod.ui b/tools/testcon/invokemethod.ui index d410503..f36bd23 100644 --- a/tools/testcon/invokemethod.ui +++ b/tools/testcon/invokemethod.ui @@ -2,7 +2,7 @@ <author></author> <comment>********************************************************************* ** -** 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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/main.cpp b/tools/testcon/main.cpp index 34f1dfe..bc3181c 100644 --- a/tools/testcon/main.cpp +++ b/tools/testcon/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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index 065f518..cb3c00e 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h index 5a659a8..c9555d5 100644 --- a/tools/testcon/mainwindow.h +++ b/tools/testcon/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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/mainwindow.ui b/tools/testcon/mainwindow.ui index da662b2..e735528 100644 --- a/tools/testcon/mainwindow.ui +++ b/tools/testcon/mainwindow.ui @@ -2,7 +2,7 @@ <author></author> <comment>********************************************************************* ** -** 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 tools applications of the Qt Toolkit. diff --git a/tools/testcon/scripts/perlscript.pl b/tools/testcon/scripts/perlscript.pl index 168b199..87c3774 100644 --- a/tools/testcon/scripts/perlscript.pl +++ b/tools/testcon/scripts/perlscript.pl @@ -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 ActiveQt module of the Qt Toolkit. diff --git a/tools/testcon/scripts/pythonscript.py b/tools/testcon/scripts/pythonscript.py index 7a1bb0a..f1e6398 100644 --- a/tools/testcon/scripts/pythonscript.py +++ b/tools/testcon/scripts/pythonscript.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ############################################################################# ## -## 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 test suite of the Qt Toolkit. diff --git a/tools/testcon/testcon.rc b/tools/testcon/testcon.rc index acef212..3ab5047 100644 --- a/tools/testcon/testcon.rc +++ b/tools/testcon/testcon.rc @@ -23,7 +23,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "ActiveQt Test Container\0" VALUE "FileVersion", "1,0,0,1\0" VALUE "InternalName", "testcon\0" - VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).0" + VALUE "LegalCopyright", "Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "testcon.exe\0" VALUE "ProductName", "ActiveQt Test Container\0" |