diff options
author | Topi Reinio <topi.reinio@qt.io> | 2022-12-20 11:45:25 +0000 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2022-12-22 23:41:41 +0000 |
commit | 8844c6ef379f466a12a5f4981c78bdb990d92db8 (patch) | |
tree | 9bdaa297f9272db35da0f361ccdcf4db0d551954 /src | |
parent | f46bcad993886bcbec4cab119c26065ac2b180b5 (diff) |
Doc: Remove incorrect CMake instructions for QtCore-private
Drop the use of \qtcmakepackage for the module page that results in
incorrect instructions, and replace it with a snippet with the correct
commands to use.
Pick-to: 6.5 6.4 6.2
Fixes: QTBUG-109214
Change-Id: I936910ddb9e4118f931d85e4b096ad52006dcc32
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/doc/src/qtcore.qdoc | 14 | ||||
-rw-r--r-- | src/corelib/platform/android/qandroidextras.cpp | 14 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/corelib/doc/src/qtcore.qdoc b/src/corelib/doc/src/qtcore.qdoc index 2ef705dd75..a46add1342 100644 --- a/src/corelib/doc/src/qtcore.qdoc +++ b/src/corelib/doc/src/qtcore.qdoc @@ -18,9 +18,17 @@ /*! \module QtCorePrivate \title Qt Core Private C++ Classes - \qtcmakepackage CorePrivate \qtvariable core-private - - \brief Provides private core functionality. \preliminary + \brief Provides private core functionality. + +//! [qtcoreprivate-usage] + When building with CMake, use the following commands to use + private Qt Core APIs: + + \badcode + find_package(Qt6 REQUIRED COMPONENTS Core) + target_link_libraries(mytarget PRIVATE Qt6::CorePrivate) + \endcode +//! [qtcoreprivate-usage] */ diff --git a/src/corelib/platform/android/qandroidextras.cpp b/src/corelib/platform/android/qandroidextras.cpp index 414374d1e0..7499a6ac81 100644 --- a/src/corelib/platform/android/qandroidextras.cpp +++ b/src/corelib/platform/android/qandroidextras.cpp @@ -126,6 +126,8 @@ QAndroidBinder QAndroidParcelPrivate::readBinder() const \l {https://developer.android.com/reference/android/os/Parcel.html}{Android Parcel} methods. + \include qtcore.qdoc qtcoreprivate-usage + \since 6.2 */ @@ -243,6 +245,8 @@ QJniObject QAndroidParcel::handle() const \l {https://developer.android.com/reference/android/os/Binder.html}{Android Binder} methods. + \include qtcore.qdoc qtcoreprivate-usage + \since 6.2 */ @@ -383,6 +387,8 @@ QJniObject QAndroidBinder::handle() const It is useful when you perform a QtAndroidPrivate::bindService operation. + \include qtcore.qdoc qtcoreprivate-usage + \since 6.2 */ @@ -507,6 +513,8 @@ public: Create a subclass of this class to be notified of the results when using the \c QtAndroidPrivate::startActivity() and \c QtAndroidPrivate::startIntentSender() APIs. + + \include qtcore.qdoc qtcoreprivate-usage */ /*! @@ -604,6 +612,8 @@ public: \l {https://developer.android.com/reference/android/app/Service.html}{Android Service} methods. + \include qtcore.qdoc qtcoreprivate-usage + \since 6.2 */ @@ -674,6 +684,8 @@ QAndroidBinder* QAndroidService::onBind(const QAndroidIntent &/*intent*/) \l {https://developer.android.com/reference/android/content/Intent.html}{Android Intent} methods. + \include qtcore.qdoc qtcoreprivate-usage + \since 6.2 */ @@ -799,6 +811,8 @@ QJniObject QAndroidIntent::handle() const \brief The QtAndroidPrivate namespace provides miscellaneous functions to aid Android development. \inheaderfile QtCore/private/qandroidextras_p.h + + \include qtcore.qdoc qtcoreprivate-usage */ /*! |