diff options
author | Oleksii Zbykovskyi <[email protected]> | 2025-08-05 15:08:38 +0200 |
---|---|---|
committer | Oleksii Zbykovskyi <[email protected]> | 2025-08-06 20:26:58 +0200 |
commit | 6fbd403fe7597f457e669bbb6551509c2097fc2d (patch) | |
tree | 3b1f8dc37b77e3abfede3027cd892c6be5ab4bd9 | |
parent | b63fb9c664c120ad9b29a151f83002d5f046d3fe (diff) |
Relocate files from separate CMake files to the main one
Removed useless CMakefiles and move their contents to the main
CMakeLists file.
Task-number: QTBUG-137566
Change-Id: Ibeb162ce43243d9af7732f39935325cbb52ecdec
Reviewed-by: Volker Hilsheimer <[email protected]>
-rw-r--r-- | src/widgets/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/widgets/doc/snippets/CMakeLists.txt | 38 | ||||
-rw-r--r-- | src/widgets/doc/snippets/customstyle/customstyle.h | 2 | ||||
-rw-r--r-- | src/widgets/doc/snippets/customviewstyle/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/widgets/doc/snippets/filedialogurls/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/widgets/doc/snippets/graphicssceneadditem/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/widgets/doc/snippets/graphicsview/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/widgets/doc/snippets/graphicsview/graphicsview.cpp | 9 | ||||
-rw-r--r-- | src/widgets/doc/snippets/graphicsview/graphicsview_snippet.cpp | 6 | ||||
-rw-r--r-- | src/widgets/doc/snippets/mdiarea/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/widgets/doc/snippets/myscrollarea/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/widgets/doc/snippets/qitemdelegate/CMakeLists.txt | 12 |
12 files changed, 52 insertions, 110 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 185075547da..946f95ce542 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -926,20 +926,4 @@ endif() if(QT_FEATURE_doc_snippets) add_subdirectory(doc/snippets) - add_subdirectory(doc/snippets/customviewstyle) - if (QT_FEATURE_filedialog) - add_subdirectory(doc/snippets/filedialogurls) - endif() - if (QT_FEATURE_graphicsview) - add_subdirectory(doc/snippets/graphicssceneadditem) - endif() - if(QT_FEATURE_opengl AND QT_FEATURE_printdialog) - add_subdirectory(doc/snippets/graphicsview) - endif() - if (QT_FEATURE_mdiarea) - add_subdirectory(doc/snippets/mdiarea) - endif() - if (QT_FEATURE_scrollarea) - add_subdirectory(doc/snippets/myscrollarea) - endif() endif() diff --git a/src/widgets/doc/snippets/CMakeLists.txt b/src/widgets/doc/snippets/CMakeLists.txt index e0209fef5c5..8c6e6dda6e6 100644 --- a/src/widgets/doc/snippets/CMakeLists.txt +++ b/src/widgets/doc/snippets/CMakeLists.txt @@ -2,6 +2,9 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause add_library(widgets_snippets OBJECT + customstyle/customstyle.cpp + customstyle/main.cpp + customviewstyle/customviewstyle.cpp dialogs/dialogs.cpp dockwidgets/mainwindow.cpp itemselection/main.cpp @@ -50,6 +53,41 @@ qt_internal_extend_target(widgets_snippets qrhiwidget/rhiwidgetintro.cpp ) +qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_filedialog + SOURCES + filedialogurls/filedialogurls.cpp +) + +qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_graphicsview + SOURCES + graphicssceneadditem/graphicssceneadditemsnippet.cpp + graphicsview/graphicsview_snippet.cpp +) + +qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_opengl AND QT_FEATURE_printsupport + LIBRARIES + Qt::OpenGL + Qt::OpenGLWidgets + Qt::PrintSupport + SOURCES + graphicsview/graphicsview.cpp +) + +qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_mdiarea + SOURCES + mdiarea/mdiareasnippets.cpp +) + +qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_scrollarea + SOURCES + myscrollarea/myscrollarea.cpp +) + +qt_internal_extend_target(widgets_snippets CONDITION QT_FEATURE_spinbox AND QT_FEATURE_itemviews + SOURCES + qitemdelegate/spinbox-delegate.cpp +) + set_target_properties(widgets_snippets PROPERTIES COMPILE_OPTIONS "-w") if ("${CMAKE_CXX_COMPILE_FEATURES}" MATCHES "cxx_std_23") diff --git a/src/widgets/doc/snippets/customstyle/customstyle.h b/src/widgets/doc/snippets/customstyle/customstyle.h index 370065c2b33..ac1c961d73d 100644 --- a/src/widgets/doc/snippets/customstyle/customstyle.h +++ b/src/widgets/doc/snippets/customstyle/customstyle.h @@ -12,7 +12,7 @@ class CustomStyle : public QProxyStyle Q_OBJECT public: - CustomStyle(const QWidget *widget); + explicit CustomStyle(const QWidget *widget = nullptr); ~CustomStyle() {} void drawPrimitive(PrimitiveElement element, const QStyleOption *option, diff --git a/src/widgets/doc/snippets/customviewstyle/CMakeLists.txt b/src/widgets/doc/snippets/customviewstyle/CMakeLists.txt deleted file mode 100644 index f37de58edc2..00000000000 --- a/src/widgets/doc/snippets/customviewstyle/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_customviewstyle_snippets OBJECT - ../customstyle/customstyle.h - ../customstyle/customstyle.cpp - customviewstyle.cpp -) - -target_link_libraries(widgets_customviewstyle_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets -) - -set_target_properties(widgets_customviewstyle_snippets PROPERTIES UNITY_BUILD OFF) diff --git a/src/widgets/doc/snippets/filedialogurls/CMakeLists.txt b/src/widgets/doc/snippets/filedialogurls/CMakeLists.txt deleted file mode 100644 index 4c64ff3288c..00000000000 --- a/src/widgets/doc/snippets/filedialogurls/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_filedialogurl_snippets OBJECT - filedialogurls.cpp -) - -target_link_libraries(widgets_filedialogurl_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets -) diff --git a/src/widgets/doc/snippets/graphicssceneadditem/CMakeLists.txt b/src/widgets/doc/snippets/graphicssceneadditem/CMakeLists.txt deleted file mode 100644 index a2d391d6298..00000000000 --- a/src/widgets/doc/snippets/graphicssceneadditem/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_graphicssceneadditem_snippets OBJECT - graphicssceneadditemsnippet.cpp -) - -target_link_libraries(widgets_graphicssceneadditem_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets -) diff --git a/src/widgets/doc/snippets/graphicsview/CMakeLists.txt b/src/widgets/doc/snippets/graphicsview/CMakeLists.txt deleted file mode 100644 index e395eda0450..00000000000 --- a/src/widgets/doc/snippets/graphicsview/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_graphicsview_snippets OBJECT - graphicsview.cpp -) - -target_link_libraries(widgets_graphicsview_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets - Qt::OpenGL - Qt::OpenGLWidgets - Qt::PrintSupport -) diff --git a/src/widgets/doc/snippets/graphicsview/graphicsview.cpp b/src/widgets/doc/snippets/graphicsview/graphicsview.cpp index e66d2d84fb2..2d76f671b1b 100644 --- a/src/widgets/doc/snippets/graphicsview/graphicsview.cpp +++ b/src/widgets/doc/snippets/graphicsview/graphicsview.cpp @@ -1,5 +1,12 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include <QtPrintSupport/qtprintsupportglobal.h> + +#include <QtPrintSupport/qabstractprintdialog.h> + +#if QT_CONFIG(printdialog) + #include <QStandardItem> #include <QtCore/qmimedata.h> #include <QtGui/qdrag.h> @@ -101,3 +108,5 @@ gl->setFormat(format); view.setViewport(gl); //! [6] } + +#endif // QT_CONFIG(printdialog) diff --git a/src/widgets/doc/snippets/graphicsview/graphicsview_snippet.cpp b/src/widgets/doc/snippets/graphicsview/graphicsview_snippet.cpp index 303f2fa9e24..b9a1034ffa9 100644 --- a/src/widgets/doc/snippets/graphicsview/graphicsview_snippet.cpp +++ b/src/widgets/doc/snippets/graphicsview/graphicsview_snippet.cpp @@ -1,16 +1,18 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +#include <QGraphicsView> + //! [2] class View : public QGraphicsView { Q_OBJECT - ... + //... public slots: void zoomIn() { scale(1.2, 1.2); } void zoomOut() { scale(1 / 1.2, 1 / 1.2); } void rotateLeft() { rotate(-10); } void rotateRight() { rotate(10); } - ... + //... }; //! [2] diff --git a/src/widgets/doc/snippets/mdiarea/CMakeLists.txt b/src/widgets/doc/snippets/mdiarea/CMakeLists.txt deleted file mode 100644 index 3edb2d1b365..00000000000 --- a/src/widgets/doc/snippets/mdiarea/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_mdiarea_snippets OBJECT - mdiareasnippets.cpp -) - -target_link_libraries(widgets_mdiarea_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets -) diff --git a/src/widgets/doc/snippets/myscrollarea/CMakeLists.txt b/src/widgets/doc/snippets/myscrollarea/CMakeLists.txt deleted file mode 100644 index 9e7e14dc8d9..00000000000 --- a/src/widgets/doc/snippets/myscrollarea/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_myscrollarea_snippets OBJECT - myscrollarea.cpp -) - -target_link_libraries(widgets_myscrollarea_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets -) diff --git a/src/widgets/doc/snippets/qitemdelegate/CMakeLists.txt b/src/widgets/doc/snippets/qitemdelegate/CMakeLists.txt deleted file mode 100644 index 9aad7026c7d..00000000000 --- a/src/widgets/doc/snippets/qitemdelegate/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2023 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -add_library(widgets_qitemdelegate_snippets OBJECT - spinbox-delegate.cpp -) - -target_link_libraries(widgets_qitemdelegate_snippets PRIVATE - Qt::Core - Qt::Gui - Qt::Widgets -) |