diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-09 15:55:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 16:54:03 +0200 |
| commit | 526f111b059e18414e3a03c7f9a2b8c2ed65be7a (patch) | |
| tree | d4006eb9b88fae752345be33a8b74889908d9562 /src/quick/items/qquickscreen_p.h | |
| parent | 48f278f723cc1527b1e785c416192083e67dc292 (diff) | |
Allow QtQuick private headers to be used with QT_NO_KEYWORDS.
This is necessary for the QtWebEngine module.
This also adds an empty nokeywords test using the same mechanism
as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts
at compile time.
Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/qquickscreen_p.h')
| -rw-r--r-- | src/quick/items/qquickscreen_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index b35fd04e58..721390d1b2 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -93,7 +93,7 @@ Q_SIGNALS: void primaryOrientationChanged(); void orientationChanged(); -protected slots: +protected Q_SLOTS: void screenChanged(QScreen*); private: |