diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:25:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-03 04:23:45 +0200 |
commit | a5d51e11b76d8f6a6276f7e89bf0ccbc2985d474 (patch) | |
tree | cbb473923af7db204045f6cea3882e152d3f2e8c /tests/auto/qml/testobject.h | |
parent | 91ebebdbf26907c126dcc367832ed524d64b94cf (diff) | |
parent | d342edcc22d3c9c0299e86805d93e7031507345b (diff) | |
download | qtwebchannel-a5d51e11b76d8f6a6276f7e89bf0ccbc2985d474.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Change-Id: I01b0f58c10acbef8e2d5d15fc5787e755f519af8
Diffstat (limited to 'tests/auto/qml/testobject.h')
-rw-r--r-- | tests/auto/qml/testobject.h | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/tests/auto/qml/testobject.h b/tests/auto/qml/testobject.h new file mode 100644 index 0000000..b20f2e4 --- /dev/null +++ b/tests/auto/qml/testobject.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtWebChannel module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** 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. 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. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#ifndef TESTOBJECT_H +#define TESTOBJECT_H + +#include <QObject> + +QT_BEGIN_NAMESPACE + +class TestObject : public QObject +{ + Q_OBJECT +public: + explicit TestObject(QObject *parent = Q_NULLPTR); + ~TestObject(); + +public slots: + void triggerSignals(); + +signals: + void testSignalBool(bool testBool); + void testSignalInt(int testInt); +}; + +QT_END_NAMESPACE + +#endif // TESTOBJECT_H |