1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use Qt keywords in headers

Browse Source 
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:
Kai Uwe Broulik 2023-12-01 19:23:00 +01:00
parent d3a6c1e9ea
commit c7c22eaacd
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -249,11 +249,11 @@ public:
void initEventThread(); void initEventThread();
public slots: public Q_SLOTS:
void blockingReadEvents(); void blockingReadEvents();
void flushRequests(); void flushRequests();
signals: Q_SIGNALS:
void reconnected(); void reconnected();
void globalAdded(const RegistryGlobal &global); void globalAdded(const RegistryGlobal &global);
void globalRemoved(const RegistryGlobal &global); void globalRemoved(const RegistryGlobal &global);

4
src/plugins/platforms/wayland/qwaylandinputdevice_p.h
View File

@ -258,7 +258,7 @@ public:
} }
#endif #endif
private slots: private Q_SLOTS:
void handleFocusDestroyed(); void handleFocusDestroyed();
void handleFocusLost(); void handleFocusLost();
@ -314,7 +314,7 @@ protected:
void pointer_axis_value120(uint32_t axis, int32_t value120) override; void pointer_axis_value120(uint32_t axis, int32_t value120) override;
void pointer_axis_relative_direction(uint32_t axis, uint32_t direction) override; void pointer_axis_relative_direction(uint32_t axis, uint32_t direction) override;
private slots: private Q_SLOTS:
void handleFocusDestroyed() { invalidateFocus(); } void handleFocusDestroyed() { invalidateFocus(); }
private: private:

2
src/plugins/platforms/wayland/qwaylandprimaryselectionv1_p.h
View File

@ -69,7 +69,7 @@ public:
QMimeData *mimeData() const { return m_mimeData; } QMimeData *mimeData() const { return m_mimeData; }
signals: Q_SIGNALS:
void cancelled(); void cancelled();
protected: protected:

4
src/plugins/platforms/wayland/qwaylandsurface_p.h
View File

@ -41,12 +41,12 @@ public:
static QWaylandSurface *fromWlSurface(::wl_surface *surface); static QWaylandSurface *fromWlSurface(::wl_surface *surface);
signals: Q_SIGNALS:
void screensChanged(); void screensChanged();
void preferredBufferScaleChanged(); void preferredBufferScaleChanged();
void preferredBufferTransformChanged(); void preferredBufferTransformChanged();
private slots: private Q_SLOTS:
void handleScreenRemoved(QScreen *qScreen); void handleScreenRemoved(QScreen *qScreen);
protected: protected:

6
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -237,10 +237,10 @@ public:
virtual void reinit(); virtual void reinit();
void reset(); void reset();
public slots: public Q_SLOTS:
void applyConfigure(); void applyConfigure();
signals: Q_SIGNALS:
void wlSurfaceCreated(); void wlSurfaceCreated();
void wlSurfaceDestroyed(); void wlSurfaceDestroyed();
@ -335,7 +335,7 @@ protected:
Qt::ScreenOrientation mLastReportedContentOrientation = Qt::PrimaryOrientation; Qt::ScreenOrientation mLastReportedContentOrientation = Qt::PrimaryOrientation;
private slots: private Q_SLOTS:
void doApplyConfigureFromOtherThread(); void doApplyConfigureFromOtherThread();
private: private: