aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/timeline/qquicktimeline.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2018-08-21 21:31:39 +0200
committerTim Jenssen <tim.jenssen@qt.io>2018-08-23 08:32:36 +0000
commit5fbc3fe80ce84ff861a6c7f78cbdb886df34215a (patch)
tree0b2ab3b8b70d8e971ade6edb87344fa2bbd4df95 /src/imports/timeline/qquicktimeline.cpp
parentec04ce31bcb26311fa98470a974dec491b1bdead (diff)
prepare for ci
- update .gitignore - add empty unit test directory - fix license headers Change-Id: Ie11bd02c8a1fb38a42cc6002b2c832e3d77709be Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/imports/timeline/qquicktimeline.cpp')
-rw-r--r--src/imports/timeline/qquicktimeline.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/imports/timeline/qquicktimeline.cpp b/src/imports/timeline/qquicktimeline.cpp
index d5e5b26..9e745d8 100644
--- a/src/imports/timeline/qquicktimeline.cpp
+++ b/src/imports/timeline/qquicktimeline.cpp
@@ -1,20 +1,23 @@
-/****************************************************************************
+/******************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd
-** All rights reserved.
-** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
**
-** This file is part of the Qt Enterprise Qt Quick Timeline Add-on.
+** This file is part of the Qt Quick Timeline module of the Qt Toolkit.
**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
+** $QT_BEGIN_LICENSE:COMM$
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
**
-** If you have questions regarding the use of this file, please use
-** contact form at http://www.qt.io/contact-us
+** $QT_END_LICENSE$
**
-****************************************************************************/
+******************************************************************************/
#include "qquicktimeline_p.h"