diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-13 09:38:27 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-13 09:38:33 +0100 |
| commit | 5fef8a9d91ba1a1470ddb715119f16391dd56512 (patch) | |
| tree | f15c1e9f91d665c048f82f9778e811222e00aa6e /plugins/qmlprofilerextension/scenegraphtimelinemodel.h | |
| parent | a18c411c37d632b3062797c85bb809bfc64446d3 (diff) | |
| parent | ce38b0379f60b21e07cd14e11b7a1563b4ea5c14 (diff) | |
Merge remote-tracking branch 'origin/3.3'qp-v3.4.2qp-v3.4.1qp-v3.4.0-rc1qp-v3.4.0qp-3.4
Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b
Diffstat (limited to 'plugins/qmlprofilerextension/scenegraphtimelinemodel.h')
| -rw-r--r-- | plugins/qmlprofilerextension/scenegraphtimelinemodel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h index 3e3b6b3128..6225963993 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h @@ -1,18 +1,18 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2015 The Qt Company Ltd ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/> +** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us ** ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on. ** ** Licensees holding valid Qt Enterprise licenses may use this file in ** accordance with the Qt Enterprise License Agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** a written agreement between you and The Qt Company. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com <http://qt.digia.com/> +** contact form at http://www.qt.io/contact-us ** ****************************************************************************/ |