From 5fbc3fe80ce84ff861a6c7f78cbdb886df34215a Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 21 Aug 2018 21:31:39 +0200 Subject: prepare for ci - update .gitignore - add empty unit test directory - fix license headers Change-Id: Ie11bd02c8a1fb38a42cc6002b2c832e3d77709be Reviewed-by: Thomas Hartmann --- .gitignore | 16 +++++++++++++++ .qmake.conf | 4 +++- README.md | 0 dist/changes-1.0.0 | 18 +++++++++++++++++ src/imports/timeline/qquickkeyframe.cpp | 25 +++++++++++++----------- src/imports/timeline/qquickkeyframe_p.h | 25 +++++++++++++----------- src/imports/timeline/qquicktimeline.cpp | 25 +++++++++++++----------- src/imports/timeline/qquicktimeline_p.h | 25 +++++++++++++----------- src/imports/timeline/qquicktimelineanimation.cpp | 25 +++++++++++++----------- src/imports/timeline/qquicktimelineanimation_p.h | 25 +++++++++++++----------- src/imports/timeline/qtquicktimelineplugin.cpp | 25 +++++++++++++----------- tests/auto/auto.pro | 2 ++ tests/manual/timelineTestApp/main.cpp | 25 +++++++++++++----------- tests/tests.pro | 3 +++ 14 files changed, 154 insertions(+), 89 deletions(-) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 dist/changes-1.0.0 create mode 100644 tests/auto/auto.pro create mode 100644 tests/tests.pro diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d7346e5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.DS_Store +build* +*.pro.* +*.qmlproject.* +.qmake.stash +.qmake.cache +*.autosave +Makefile* +/mkspecs* +.moc/ +.pch/ +.obj/ +.rcc +qmlplugindump_wrapper* +Makefile +*_resource.rc diff --git a/.qmake.conf b/.qmake.conf index 168dab9..fe5b824 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,6 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.10.0 +MODULE_VERSION = 5.12.0 + +CMAKE_MODULE_TESTS = - diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/dist/changes-1.0.0 b/dist/changes-1.0.0 new file mode 100644 index 0000000..32e413e --- /dev/null +++ b/dist/changes-1.0.0 @@ -0,0 +1,18 @@ +Qt Quick Timeline 1.0 + +Qt Quick Timeline 1.0 is supported from Qt 5.12 onwards. + +General Improvements +-------------------- +Introducing new component for Qt + +API changes (source break) +-------------------------- + + +New features +------------ +- Introducing new component for Qt + +Fixed issues +------------ diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp index dc13895..edd1226 100644 --- a/src/imports/timeline/qquickkeyframe.cpp +++ b/src/imports/timeline/qquickkeyframe.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 "qquickkeyframe_p.h" diff --git a/src/imports/timeline/qquickkeyframe_p.h b/src/imports/timeline/qquickkeyframe_p.h index a1e282c..9cc8c3a 100644 --- a/src/imports/timeline/qquickkeyframe_p.h +++ b/src/imports/timeline/qquickkeyframe_p.h @@ -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$ ** -****************************************************************************/ +******************************************************************************/ #ifndef QQUICKKEYFRAME_P_H #define QQUICKKEYFRAME_P_H 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" diff --git a/src/imports/timeline/qquicktimeline_p.h b/src/imports/timeline/qquicktimeline_p.h index e09daff..e61e0dc 100644 --- a/src/imports/timeline/qquicktimeline_p.h +++ b/src/imports/timeline/qquicktimeline_p.h @@ -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$ ** -****************************************************************************/ +******************************************************************************/ #ifndef QQUICKTIMELINE_P_H #define QQUICKTIMELINE_P_H diff --git a/src/imports/timeline/qquicktimelineanimation.cpp b/src/imports/timeline/qquicktimelineanimation.cpp index e3a816e..6582944 100644 --- a/src/imports/timeline/qquicktimelineanimation.cpp +++ b/src/imports/timeline/qquicktimelineanimation.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 "qquicktimelineanimation_p.h" diff --git a/src/imports/timeline/qquicktimelineanimation_p.h b/src/imports/timeline/qquicktimelineanimation_p.h index ee85b65..17e9584 100644 --- a/src/imports/timeline/qquicktimelineanimation_p.h +++ b/src/imports/timeline/qquicktimelineanimation_p.h @@ -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$ ** -****************************************************************************/ +******************************************************************************/ #ifndef QQUICKTIMELINEANIMATION_H #define QQUICKTIMELINEANIMATION_H diff --git a/src/imports/timeline/qtquicktimelineplugin.cpp b/src/imports/timeline/qtquicktimelineplugin.cpp index 35f47bd..c9d3922 100644 --- a/src/imports/timeline/qtquicktimelineplugin.cpp +++ b/src/imports/timeline/qtquicktimelineplugin.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 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro new file mode 100644 index 0000000..fce98ce --- /dev/null +++ b/tests/auto/auto.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = diff --git a/tests/manual/timelineTestApp/main.cpp b/tests/manual/timelineTestApp/main.cpp index 405b8a9..921babd 100644 --- a/tests/manual/timelineTestApp/main.cpp +++ b/tests/manual/timelineTestApp/main.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 #include diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..f887d53 --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +!package: SUBDIRS += auto -- cgit v1.2.3