diff options
author | Yuhang Zhao <2546789017@qq.com> | 2022-07-15 13:48:58 +0800 |
---|---|---|
committer | Yuhang Zhao <2546789017@qq.com> | 2022-07-19 14:39:02 +0800 |
commit | 0923817ddadd35e43bc09449436e282f834d566f (patch) | |
tree | 0da6450e0e8decfdc6ad58946ec1723c629f61a7 /src/qmltest | |
parent | 99a35ac26a6523252bb041ea00af6ff0b8c237c2 (diff) | |
download | qtdeclarative-0923817ddadd35e43bc09449436e282f834d566f.tar.gz |
Remove Qt key words from header files
So that users can use QT_NO_KEYWORDS when linking against QtDeclarative,
even if they are using private headers.
Docs, examples and tools are not touched because it's not necessary.
Pick-to: 6.4
Change-Id: Idc30797074aaa72576429ebdaaf915d7f5acf84e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmltest')
-rw-r--r-- | src/qmltest/quicktest_p.h | 4 | ||||
-rw-r--r-- | src/qmltest/quicktestevent_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qmltest/quicktest_p.h b/src/qmltest/quicktest_p.h index 1ff5b45c39..938ae6cdfc 100644 --- a/src/qmltest/quicktest_p.h +++ b/src/qmltest/quicktest_p.h @@ -54,10 +54,10 @@ public: bool hasQuit:1; bool hasTestCase() const { return m_hasTestCase; } - void setHasTestCase(bool value) { m_hasTestCase = value; emit hasTestCaseChanged(); } + void setHasTestCase(bool value) { m_hasTestCase = value; Q_EMIT hasTestCaseChanged(); } bool windowShown() const { return m_windowShown; } - void setWindowShown(bool value) { m_windowShown = value; emit windowShownChanged(); } + void setWindowShown(bool value) { m_windowShown = value; Q_EMIT windowShownChanged(); } QQmlPropertyMap *defined() const { return m_defined; } void init() { setWindowShown(false); setHasTestCase(false); hasQuit = false; } diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h index 6b4487303c..c75d8f6706 100644 --- a/src/qmltest/quicktestevent_p.h +++ b/src/qmltest/quicktestevent_p.h @@ -33,7 +33,7 @@ class Q_QUICK_TEST_PRIVATE_EXPORT QQuickTouchEventSequence : public QObject public: explicit QQuickTouchEventSequence(QuickTestEvent *testEvent, QObject *item = nullptr); -public slots: +public Q_SLOTS: QObject* press(int touchId, QObject *item, qreal x, qreal y); QObject* move(int touchId, QObject *item, qreal x, qreal y); QObject* release(int touchId, QObject *item, qreal x, qreal y); |