From bff67a3ebfff06a27ac7281f7f491b57b7ba93a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 18 Aug 2022 14:53:14 +0200 Subject: [PATCH] Doc: Remove qmake-only reference in Q_IMPORT_PLUGIN description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Static Plugins page describes handling of qmake and CMake already in greater detail. No need to replicate it here. Task-number: QTBUG-88044 Change-Id: I2cae85c0b0d20585b563bab9e263121181adeb8c Reviewed-by: Jörg Bornemann (cherry picked from commit 836b2ae1e6c76775b38eb59f0b01c66a83a0fe9a) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/doc/snippets/code/doc_src_qplugin.pro | 4 ---- src/corelib/plugin/qplugin.qdoc | 8 +++----- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 src/corelib/doc/snippets/code/doc_src_qplugin.pro diff --git a/src/corelib/doc/snippets/code/doc_src_qplugin.pro b/src/corelib/doc/snippets/code/doc_src_qplugin.pro deleted file mode 100644 index 52fb9e31635..00000000000 --- a/src/corelib/doc/snippets/code/doc_src_qplugin.pro +++ /dev/null @@ -1,4 +0,0 @@ -#! [3] -TEMPLATE = app -QTPLUGIN += qjpeg qgif # image formats -#! [3] diff --git a/src/corelib/plugin/qplugin.qdoc b/src/corelib/plugin/qplugin.qdoc index ed023a75c99..dd4aa5f4b09 100644 --- a/src/corelib/plugin/qplugin.qdoc +++ b/src/corelib/plugin/qplugin.qdoc @@ -82,11 +82,9 @@ \snippet code/doc_src_qplugin.cpp 2 Static plugins must also be included by the linker when your - application is built. For Qt's predefined plugins, - you can use the \c QTPLUGIN to add - the required plugins to your build. For example: + application is built. See \l{Static Plugins} for more information + on this. - \snippet code/doc_src_qplugin.pro 3 - \sa {Static Plugins}, {How to Create Qt Plugins}, {qmake-getting-started}{Getting Started with qmake} + \sa {Static Plugins}, {How to Create Qt Plugins} */