summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc/snippets
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-05-22 16:12:02 +0200
committerKai Koehne <kai.koehne@qt.io>2020-05-31 18:44:57 +0200
commit32a39c4ed1802eab7454d3e6007ff02aa9581b66 (patch)
tree67f26f32d94bca9051a40b03a583a99a913e03eb /src/widgets/doc/snippets
parentc84e9c0700639d2878b8c6caec3f661c4fc4c74d (diff)
Document how to use CMake for Qt Widgets
Task-number: QTBUG-73058 Change-Id: Ida459635e159334a4ef67979c0d28b1553317ea9 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/widgets/doc/snippets')
-rw-r--r--src/widgets/doc/snippets/CMakeLists.txt4
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp53
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qtwidgets.pro3
-rw-r--r--src/widgets/doc/snippets/snippets.pro6
4 files changed, 9 insertions, 57 deletions
diff --git a/src/widgets/doc/snippets/CMakeLists.txt b/src/widgets/doc/snippets/CMakeLists.txt
new file mode 100644
index 0000000000..66ce019f33
--- /dev/null
+++ b/src/widgets/doc/snippets/CMakeLists.txt
@@ -0,0 +1,4 @@
+#! [cmake_use]
+find_package(Qt6 COMPONENTS Widgets REQUIRED)
+target_link_libraries(mytarget Qt::Widgets)
+#! [cmake_use]
diff --git a/src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp b/src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp
deleted file mode 100644
index c0a57e527c..0000000000
--- a/src/widgets/doc/snippets/code/doc_src_qtwidgets.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$
-**
-****************************************************************************/
-
-//! [1]
-#include <QtWidgets>
-//! [1]
diff --git a/src/widgets/doc/snippets/code/doc_src_qtwidgets.pro b/src/widgets/doc/snippets/code/doc_src_qtwidgets.pro
deleted file mode 100644
index 2fee715c24..0000000000
--- a/src/widgets/doc/snippets/code/doc_src_qtwidgets.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-#! [0]
-QT += widgets
-#! [0]
diff --git a/src/widgets/doc/snippets/snippets.pro b/src/widgets/doc/snippets/snippets.pro
index 6284e84913..fcfd998373 100644
--- a/src/widgets/doc/snippets/snippets.pro
+++ b/src/widgets/doc/snippets/snippets.pro
@@ -2,7 +2,11 @@ TEMPLATE = lib
TARGET = widgets_snippets
-QT += widgets printsupport opengl openglwidgets
+#! [qmake_use]
+QT += widgets
+#! [qmake_use]
+
+QT += printsupport opengl openglwidgets
SOURCES += customviewstyle.cpp \
filedialogurls.cpp \