diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-08-01 00:33:49 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-08-28 11:37:35 +0200 |
| commit | 239982901beaf039c25b264a9c6b63aa6fe70710 (patch) | |
| tree | 8513201e0e2983bb819d99ac2bfaa2a0c7d18d91 /src/gui/kernel/qwindow.h | |
| parent | 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8 (diff) | |
Doc: Fix documentation warnings for Qt GUI
* Drop deprecation warnings for now-dropped items
* Use the 'qt6' define and a new \nothing doc macro to conditionally
document items on Qt 6
* Add a custom module header for docs that pulls in also Vulkan headers
* Add \internal command for internal classes/functions
* Move QtGUI-related code snippets from widgets to gui docs
Change-Id: Ieb386b96631a49568d09059906d307c45c01d93a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindow.h')
| -rw-r--r-- | src/gui/kernel/qwindow.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index a82d2c3c05..6989d0bb63 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -107,7 +107,7 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface // Any new properties which you add here MUST be versioned and MUST be documented both as // C++ properties in qwindow.cpp AND as QML properties in qquickwindow.cpp. - // http://qt-project.org/doc/qt-5.0/qtqml/qtqml-cppintegration-definetypes.html#type-revisions-and-versions + // https://doc.qt.io/qt/qtqml-cppintegration-definetypes.html#type-revisions-and-versions Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY windowTitleChanged) Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged) @@ -125,7 +125,11 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION(2, 1)) Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION(2, 1)) +#ifdef Q_QDOC + Q_PROPERTY(QWindow* transientParent READ transientParent WRITE setTransientParent NOTIFY transientParentChanged) +#else Q_PRIVATE_PROPERTY(QWindow::d_func(), QWindow* transientParent MEMBER transientParent WRITE setTransientParent NOTIFY transientParentChanged REVISION(2, 13)) +#endif public: enum Visibility { |