From cede00ec892805ad0f04db6566bf002195c4cb09 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 May 2020 16:20:58 +0200 Subject: Document how to use CMake for Qt Xml Task-number: QTBUG-73058 Change-Id: I2d19670016c9aef5e96d74b2b7e22c675058f30c Reviewed-by: Paul Wicking --- src/xml/doc/snippets/CMakeLists.txt | 4 +++ src/xml/doc/snippets/code/doc_src_qtxml.cpp | 53 ----------------------------- src/xml/doc/snippets/code/doc_src_qtxml.pro | 3 -- src/xml/doc/snippets/snippets.pro | 9 +++++ 4 files changed, 13 insertions(+), 56 deletions(-) create mode 100644 src/xml/doc/snippets/CMakeLists.txt delete mode 100644 src/xml/doc/snippets/code/doc_src_qtxml.cpp delete mode 100644 src/xml/doc/snippets/code/doc_src_qtxml.pro create mode 100644 src/xml/doc/snippets/snippets.pro (limited to 'src/xml/doc/snippets') diff --git a/src/xml/doc/snippets/CMakeLists.txt b/src/xml/doc/snippets/CMakeLists.txt new file mode 100644 index 0000000000..bcfc5cd0b6 --- /dev/null +++ b/src/xml/doc/snippets/CMakeLists.txt @@ -0,0 +1,4 @@ +#! [cmake_use] +find_package(Qt6 COMPONENTS Xml REQUIRED) +target_link_libraries(mytarget Qt::Xml) +#! [cmake_use] diff --git a/src/xml/doc/snippets/code/doc_src_qtxml.cpp b/src/xml/doc/snippets/code/doc_src_qtxml.cpp deleted file mode 100644 index dfda547242..0000000000 --- a/src/xml/doc/snippets/code/doc_src_qtxml.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [0] -#include -//! [0] diff --git a/src/xml/doc/snippets/code/doc_src_qtxml.pro b/src/xml/doc/snippets/code/doc_src_qtxml.pro deleted file mode 100644 index 71d23856b0..0000000000 --- a/src/xml/doc/snippets/code/doc_src_qtxml.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [1] -QT += xml -#! [1] diff --git a/src/xml/doc/snippets/snippets.pro b/src/xml/doc/snippets/snippets.pro new file mode 100644 index 0000000000..df72b89d98 --- /dev/null +++ b/src/xml/doc/snippets/snippets.pro @@ -0,0 +1,9 @@ +TEMPLATE = lib + +TARGET = xml_snippets + +#! [qmake_use] +QT += xml +#! [qmake_use] + +load(qt_common) -- cgit v1.2.3