diff options
-rw-r--r-- | examples/widgets/doc/images/itemviewspuzzle-example.png | bin | 196251 -> 0 bytes | |||
-rw-r--r-- | examples/widgets/doc/src/itemviewspuzzle.qdoc | 15 | ||||
-rw-r--r-- | examples/widgets/itemviews/CMakeLists.txt | 3 | ||||
-rw-r--r-- | examples/widgets/itemviews/itemviews.pro | 2 | ||||
-rw-r--r-- | src/widgets/doc/src/model-view-programming.qdoc | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 2 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/CMakeLists.txt (renamed from examples/widgets/itemviews/puzzle/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/example.jpg (renamed from examples/widgets/itemviews/puzzle/example.jpg) | bin | 42654 -> 42654 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/main.cpp (renamed from examples/widgets/itemviews/puzzle/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/mainwindow.cpp (renamed from examples/widgets/itemviews/puzzle/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/mainwindow.h (renamed from examples/widgets/itemviews/puzzle/mainwindow.h) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/piecesmodel.cpp (renamed from examples/widgets/itemviews/puzzle/piecesmodel.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/piecesmodel.h (renamed from examples/widgets/itemviews/puzzle/piecesmodel.h) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/puzzle.pro (renamed from examples/widgets/itemviews/puzzle/puzzle.pro) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/puzzle.qrc (renamed from examples/widgets/itemviews/puzzle/puzzle.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/puzzlewidget.cpp (renamed from examples/widgets/itemviews/puzzle/puzzlewidget.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/itemviews/puzzle/puzzlewidget.h (renamed from examples/widgets/itemviews/puzzle/puzzlewidget.h) | 0 |
17 files changed, 1 insertions, 23 deletions
diff --git a/examples/widgets/doc/images/itemviewspuzzle-example.png b/examples/widgets/doc/images/itemviewspuzzle-example.png Binary files differdeleted file mode 100644 index aae6a953cab..00000000000 --- a/examples/widgets/doc/images/itemviewspuzzle-example.png +++ /dev/null diff --git a/examples/widgets/doc/src/itemviewspuzzle.qdoc b/examples/widgets/doc/src/itemviewspuzzle.qdoc deleted file mode 100644 index 9e77caf87e5..00000000000 --- a/examples/widgets/doc/src/itemviewspuzzle.qdoc +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example itemviews/puzzle - \title Item Views Puzzle Example - \ingroup examples-itemviews - \brief The Puzzle example shows how to enable drag and drop with a custom model - to allow items to be transferred between a view and another widget. - - \image itemviewspuzzle-example.png - - This example is an implementation of a simple jigsaw puzzle game using the - built-in support for drag and drop provided by Qt's model/view framework. -*/ diff --git a/examples/widgets/itemviews/CMakeLists.txt b/examples/widgets/itemviews/CMakeLists.txt index 92874e57bc6..93c36368ce6 100644 --- a/examples/widgets/itemviews/CMakeLists.txt +++ b/examples/widgets/itemviews/CMakeLists.txt @@ -15,9 +15,6 @@ qt_internal_add_example(simplewidgetmapper) qt_internal_add_example(spinboxdelegate) qt_internal_add_example(spreadsheet) qt_internal_add_example(stardelegate) -if(QT_FEATURE_draganddrop) - qt_internal_add_example(puzzle) -endif() if(TARGET Qt6::Xml) qt_internal_add_example(simpledommodel) endif() diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro index 28d5a93244c..3b99ff9606d 100644 --- a/examples/widgets/itemviews/itemviews.pro +++ b/examples/widgets/itemviews/itemviews.pro @@ -8,12 +8,10 @@ SUBDIRS = addressbook \ fetchmore \ frozencolumn \ pixelator \ - puzzle \ simpledommodel \ simpletreemodel \ simplewidgetmapper \ spinboxdelegate \ spreadsheet \ stardelegate -!qtConfig(draganddrop): SUBDIRS -= puzzle !qtHaveModule(xml): SUBDIRS -= simpledommodel diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index 2b80c66e171..09faebacd94 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -1818,8 +1818,6 @@ Note that the model will typically need to provide implementations of the QAbstractItemModel::insertRows() and QAbstractItemModel::setData() functions. - \sa {itemviews/puzzle}{Item Views Puzzle Example} - \section1 Proxy Models In the model/view framework, items of data supplied by a single model can be shared diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 2513bb2a0c4..89fccfc2ba2 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -88,7 +88,7 @@ extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); that can be taken for views that are intended to display items with equal sizes is to set the \l uniformItemSizes property to true. - \sa {View Classes}, {Item Views Puzzle Example}, QTreeView, QTableView, QListWidget + \sa {View Classes}, QTreeView, QTableView, QListWidget */ /*! diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/tests/manual/examples/widgets/itemviews/puzzle/CMakeLists.txt index e411e0c6e3d..e411e0c6e3d 100644 --- a/examples/widgets/itemviews/puzzle/CMakeLists.txt +++ b/tests/manual/examples/widgets/itemviews/puzzle/CMakeLists.txt diff --git a/examples/widgets/itemviews/puzzle/example.jpg b/tests/manual/examples/widgets/itemviews/puzzle/example.jpg Binary files differindex 023203c57aa..023203c57aa 100644 --- a/examples/widgets/itemviews/puzzle/example.jpg +++ b/tests/manual/examples/widgets/itemviews/puzzle/example.jpg diff --git a/examples/widgets/itemviews/puzzle/main.cpp b/tests/manual/examples/widgets/itemviews/puzzle/main.cpp index 32e219256a6..32e219256a6 100644 --- a/examples/widgets/itemviews/puzzle/main.cpp +++ b/tests/manual/examples/widgets/itemviews/puzzle/main.cpp diff --git a/examples/widgets/itemviews/puzzle/mainwindow.cpp b/tests/manual/examples/widgets/itemviews/puzzle/mainwindow.cpp index f4b221df204..f4b221df204 100644 --- a/examples/widgets/itemviews/puzzle/mainwindow.cpp +++ b/tests/manual/examples/widgets/itemviews/puzzle/mainwindow.cpp diff --git a/examples/widgets/itemviews/puzzle/mainwindow.h b/tests/manual/examples/widgets/itemviews/puzzle/mainwindow.h index 56a59b805c7..56a59b805c7 100644 --- a/examples/widgets/itemviews/puzzle/mainwindow.h +++ b/tests/manual/examples/widgets/itemviews/puzzle/mainwindow.h diff --git a/examples/widgets/itemviews/puzzle/piecesmodel.cpp b/tests/manual/examples/widgets/itemviews/puzzle/piecesmodel.cpp index 8e3ccf4aa38..8e3ccf4aa38 100644 --- a/examples/widgets/itemviews/puzzle/piecesmodel.cpp +++ b/tests/manual/examples/widgets/itemviews/puzzle/piecesmodel.cpp diff --git a/examples/widgets/itemviews/puzzle/piecesmodel.h b/tests/manual/examples/widgets/itemviews/puzzle/piecesmodel.h index 878ed73a70b..878ed73a70b 100644 --- a/examples/widgets/itemviews/puzzle/piecesmodel.h +++ b/tests/manual/examples/widgets/itemviews/puzzle/piecesmodel.h diff --git a/examples/widgets/itemviews/puzzle/puzzle.pro b/tests/manual/examples/widgets/itemviews/puzzle/puzzle.pro index dcc27aae6a2..dcc27aae6a2 100644 --- a/examples/widgets/itemviews/puzzle/puzzle.pro +++ b/tests/manual/examples/widgets/itemviews/puzzle/puzzle.pro diff --git a/examples/widgets/itemviews/puzzle/puzzle.qrc b/tests/manual/examples/widgets/itemviews/puzzle/puzzle.qrc index 4076cec0267..4076cec0267 100644 --- a/examples/widgets/itemviews/puzzle/puzzle.qrc +++ b/tests/manual/examples/widgets/itemviews/puzzle/puzzle.qrc diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp b/tests/manual/examples/widgets/itemviews/puzzle/puzzlewidget.cpp index 15aa6ac94f3..15aa6ac94f3 100644 --- a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp +++ b/tests/manual/examples/widgets/itemviews/puzzle/puzzlewidget.cpp diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.h b/tests/manual/examples/widgets/itemviews/puzzle/puzzlewidget.h index d1c00872ecf..d1c00872ecf 100644 --- a/examples/widgets/itemviews/puzzle/puzzlewidget.h +++ b/tests/manual/examples/widgets/itemviews/puzzle/puzzlewidget.h |