aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2022-09-30 13:26:36 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-17 16:11:42 +0000
commit79ff0a89ea33b235727a6b811d2ebabe2b7dc439 (patch)
tree3407c8cc6cfff1945873794b8b6f39fc02ad8f7f
parentc5b40d083fbf15c69aece72b15565915db1f6a11 (diff)
Doc: Fix compilation errors in snippet
error: Non-const static data member must be initialized out of line Change-Id: I2b2785529ac8fd0d81e49c226065d263df417e17 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 37730c6e1786e49083263c4deff5c37db7595cd1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/doc/src/qmlfunctions.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 6760f87dc7..cc4f4a2747 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -284,7 +284,7 @@
// Initialize this using myObject where you would previously
// call qmlRegisterSingletonInstance().
- static MySingleton *s_singletonInstance = nullptr;
+ inline static MySingleton *s_singletonInstance = nullptr;
static MySingleton *create(QQmlEngine *, QJSEngine *engine)
{
@@ -308,7 +308,7 @@
}
private:
- static QJSEngine *s_engine = nullptr;
+ inline static QJSEngine *s_engine = nullptr;
};
\endcode