summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorDennis Oberst <dennis.oberst@qt.io>2023-03-01 13:39:20 +0100
committerDennis Oberst <dennis.oberst@qt.io>2023-03-09 17:26:59 +0000
commitfbb470b40b2c86a55751bf3099cc0424f66c7274 (patch)
tree6de0373b8a005b160db93dfbfa54f3f1d08114bd /examples
parentb5e9d418959a9d427c14468886470791527e157f (diff)
Example: remove map example
This example only demonstrates the use of blockingMapped. Considering that the QtConcurrent::mapped~ functions are already included in the wordcount example, and have very similar APIs to the QtConcurrent::filter~ functions, which are included in the progressdialog example, this no longer serves a useful purpose. Task-number: QTBUG-111165 Pick-to: 6.5 6.5.0 Change-Id: Ibc526e1a9fb17070e376e45151e9c2bdbc69bd32 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/qtconcurrent/CMakeLists.txt5
-rw-r--r--examples/qtconcurrent/map/CMakeLists.txt31
-rw-r--r--examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc14
-rw-r--r--examples/qtconcurrent/map/main.cpp35
-rw-r--r--examples/qtconcurrent/map/map.pro9
-rw-r--r--examples/qtconcurrent/qtconcurrent.pro7
6 files changed, 1 insertions, 100 deletions
diff --git a/examples/qtconcurrent/CMakeLists.txt b/examples/qtconcurrent/CMakeLists.txt
index 89462b589c..07b4f9d67c 100644
--- a/examples/qtconcurrent/CMakeLists.txt
+++ b/examples/qtconcurrent/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
if(NOT TARGET Qt6::Concurrent)
@@ -10,6 +10,3 @@ if(TARGET Qt6::Widgets)
qt_internal_add_example(runfunction)
qt_internal_add_example(wordcount)
endif()
-if(TARGET Qt6::Gui)
- qt_internal_add_example(map)
-endif()
diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt
deleted file mode 100644
index 9546e19773..0000000000
--- a/examples/qtconcurrent/map/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-cmake_minimum_required(VERSION 3.16)
-project(mapdemo LANGUAGES CXX)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qtconcurrent/map")
-
-find_package(Qt6 REQUIRED COMPONENTS Concurrent Core Gui)
-
-qt_standard_project_setup()
-
-qt_add_executable(mapdemo
- main.cpp
-)
-
-target_link_libraries(mapdemo PRIVATE
- Qt6::Concurrent
- Qt6::Core
- Qt6::Gui
-)
-
-install(TARGETS mapdemo
- RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
- BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
- LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc
deleted file mode 100644
index 3a9a5ba4d9..0000000000
--- a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
- \example map
- \title Map Example
- \brief Demonstrates how to scale images synchronously.
- \ingroup qtconcurrentexamples
-
- The QtConcurrent Map example shows how to use the synchronous (blocking)
- QtConcurrent API to scale a collection of images.
-
- This is a command-line application.
-*/
diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp
deleted file mode 100644
index c4a19c22f4..0000000000
--- a/examples/qtconcurrent/map/main.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-#include <QImage>
-#include <QList>
-#include <QThread>
-#include <QDebug>
-#include <QGuiApplication>
-#include <qtconcurrentmap.h>
-
-#include <functional>
-
-int main(int argc, char *argv[])
-{
- QGuiApplication app(argc, argv);
-
- const int imageCount = 20;
-
- // Create a list containing imageCount images.
- QList<QImage> images;
- for (int i = 0; i < imageCount; ++i)
- images.append(QImage(1600, 1200, QImage::Format_ARGB32_Premultiplied));
-
- std::function<QImage(const QImage&)> scale = [](const QImage &image) -> QImage
- {
- qDebug() << "Scaling image in thread" << QThread::currentThread();
- return image.scaled(QSize(100, 100), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- };
-
- // Use QtConcurrentBlocking::mapped to apply the scale function to all the
- // images in the list.
- QList<QImage> thumbnails = QtConcurrent::blockingMapped(images, scale);
-
- return 0;
-}
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
deleted file mode 100644
index 7f267beb22..0000000000
--- a/examples/qtconcurrent/map/map.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET = mapdemo
-QT += concurrent
-CONFIG += cmdline
-
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map
-INSTALLS += target
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index bdf41b03ea..ccebd0d18c 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -2,17 +2,10 @@ requires(qtHaveModule(concurrent))
TEMPLATE = subdirs
SUBDIRS = imagescaling \
- map \
progressdialog \
runfunction \
wordcount
-
-!qtHaveModule(gui) {
- SUBDIRS -= \
- map
-}
-
!qtHaveModule(widgets) {
SUBDIRS -= \
imagescaling \