diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-11 10:48:42 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-11 10:48:42 +0100 |
commit | 4264061a20c6e1d42c043ada95b4e231df907d27 (patch) | |
tree | 75b708195af7dd19949b0b047fefb7b56269ba17 /src/imports/templates | |
parent | 0a86cab635e66ba44dcf3866c698aa1d037acff9 (diff) | |
parent | 00a062649b8aec20c3ac3f61aa72b1cdde43b055 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
Diffstat (limited to 'src/imports/templates')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc index 2e22196b..d6bb017a 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc index 977616bd..342b3f20 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index d8dce4c9..3166afd9 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. |