Don't use Qt keywords in headers
Unfortunately for many Wayland features applications need to access Qt private headers which will fail if the project is built with QT_NO_KEYWORDS. Ideally, the examples and tests were ported, too, and QT_NO_KEYWORDS enabled in .cmakec.conf. Pick-to: 6.7 Change-Id: I9f988d304bcc8dba4dd84761c41ba3da2473515d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
parent
d3a6c1e9ea
commit
c7c22eaacd
@ -249,11 +249,11 @@ public:
|
||||
|
||||
void initEventThread();
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void blockingReadEvents();
|
||||
void flushRequests();
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void reconnected();
|
||||
void globalAdded(const RegistryGlobal &global);
|
||||
void globalRemoved(const RegistryGlobal &global);
|
||||
|
@ -258,7 +258,7 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleFocusDestroyed();
|
||||
void handleFocusLost();
|
||||
|
||||
@ -314,7 +314,7 @@ protected:
|
||||
void pointer_axis_value120(uint32_t axis, int32_t value120) override;
|
||||
void pointer_axis_relative_direction(uint32_t axis, uint32_t direction) override;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleFocusDestroyed() { invalidateFocus(); }
|
||||
|
||||
private:
|
||||
|
@ -69,7 +69,7 @@ public:
|
||||
|
||||
QMimeData *mimeData() const { return m_mimeData; }
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void cancelled();
|
||||
|
||||
protected:
|
||||
|
@ -41,12 +41,12 @@ public:
|
||||
|
||||
static QWaylandSurface *fromWlSurface(::wl_surface *surface);
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void screensChanged();
|
||||
void preferredBufferScaleChanged();
|
||||
void preferredBufferTransformChanged();
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleScreenRemoved(QScreen *qScreen);
|
||||
|
||||
protected:
|
||||
|
@ -237,10 +237,10 @@ public:
|
||||
virtual void reinit();
|
||||
void reset();
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
void applyConfigure();
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
void wlSurfaceCreated();
|
||||
void wlSurfaceDestroyed();
|
||||
|
||||
@ -335,7 +335,7 @@ protected:
|
||||
|
||||
Qt::ScreenOrientation mLastReportedContentOrientation = Qt::PrimaryOrientation;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void doApplyConfigureFromOtherThread();
|
||||
|
||||
private:
|
||||
|
Loading…
x
Reference in New Issue
Block a user