diff options
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 5 | ||||
| -rw-r--r-- | src/quick/doc/src/advtutorial.qdoc | 12 | ||||
| -rw-r--r-- | src/quick/doc/src/dynamicview-tutorial.qdoc | 12 |
3 files changed, 10 insertions, 19 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index 016c96e0bf..2f9c07cf20 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -406,8 +406,7 @@ QModelIndex QQuickFolderListModel::index(int row, int , const QModelIndex &) con The \a folder property holds a URL for the folder that the model is currently providing. - The value is a URL expressed as a string, and must be a \c file: or \c qrc: - URL, or a relative URL. + The value must be a \c file: or \c qrc: URL, or a relative URL. By default, the value is an invalid URL. */ @@ -447,7 +446,7 @@ void QQuickFolderListModel::setFolder(const QUrl &folder) /*! - \qmlproperty string QQuickFolderListModel::rootFolder + \qmlproperty url QQuickFolderListModel::rootFolder When the rootFolder is set, then this folder will be threated as the root in the file system, so that diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc index 80a0173f32..966bd9d804 100644 --- a/src/quick/doc/src/advtutorial.qdoc +++ b/src/quick/doc/src/advtutorial.qdoc @@ -52,10 +52,10 @@ control QML types. Tutorial chapters: \list 1 -\li \l {quick/tutorials/samegame/samegame1}{Creating the Game Canvas and Blocks} -\li \l {quick/tutorials/samegame/samegame2}{Populating the Game Canvas} -\li \l {quick/tutorials/samegame/samegame3}{Implementing the Game Logic} -\li \l {quick/tutorials/samegame/samegame4}{Finishing Touches} +\li \l {QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks}{Creating the Game Canvas and Blocks} +\li \l {QML Advanced Tutorial 2 - Populating the Game Canvas}{Populating the Game Canvas} +\li \l {QML Advanced Tutorial 3 - Implementing the Game Logic}{Implementing the Game Logic} +\li \l {QML Advanced Tutorial 4 - Finishing Touches}{Finishing Touches} \endlist All the code in this tutorial can be found in Qt's \c examples/quick/tutorials/samegame @@ -63,7 +63,6 @@ directory. */ /*! -\page qml-advtutorial1.html \title QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks \contentspage QML Advanced Tutorial \previouspage QML Advanced Tutorial @@ -132,7 +131,6 @@ types to get started. Next, we will populate the game canvas with some blocks. /*! -\page qml-advtutorial2.html \title QML Advanced Tutorial 2 - Populating the Game Canvas \contentspage QML Advanced Tutorial \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks @@ -207,7 +205,6 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics. */ /*! -\page qml-advtutorial3.html \title QML Advanced Tutorial 3 - Implementing the Game Logic \contentspage QML Advanced Tutorial \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas @@ -295,7 +292,6 @@ until the next chapter - where your application becomes alive! */ /*! -\page qml-advtutorial4.html \title QML Advanced Tutorial 4 - Finishing Touches \contentspage QML Advanced Tutorial \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc index fad09b396b..c579d0f7ef 100644 --- a/src/quick/doc/src/dynamicview-tutorial.qdoc +++ b/src/quick/doc/src/dynamicview-tutorial.qdoc @@ -38,10 +38,10 @@ data to dynamically sort all items in a view. Tutorial chapters: \list 1 -\li \l {quick/tutorials/dynamicview/dynamicview1}{A Simple ListView and Delegate} -\li \l {quick/tutorials/dynamicview/dynamicview2}{Dragging View Items} -\li \l {quick/tutorials/dynamicview/dynamicview3}{Moving Dragged Items} -\li \l {quick/tutorials/dynamicview/dynamicview4}{Sorting Items} +\li \l {QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate}{A Simple ListView and Delegate} +\li \l {QML Dynamic View Ordering Tutorial 2 - Dragging View Items}{Dragging View Items} +\li \l {QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items}{Moving Dragged Items} +\li \l {QML Dynamic View Ordering Tutorial 4 - Sorting Items}{Sorting Items} \endlist All the code in this tutorial can be found in Qt's \c examples/quick/tutorials/dynamicview @@ -49,7 +49,6 @@ directory. */ /*! -\page qml-dynamicview-tutorial1.html \title QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate \contentspage QML Dynamic View Ordering Tutorial \previouspage QML Dynamic View Ordering Tutorial @@ -85,7 +84,6 @@ The second part of the application is the ListView itself to which we bind the m */ /*! -\page qml-dynamicview-tutorial2.html \title QML Dynamic View Ordering Tutorial 2 - Dragging View Items \contentspage QML Dynamic View Ordering Tutorial \previouspage QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate @@ -129,7 +127,6 @@ so that is above other items in the stacking order and isn't obscured as it is d */ /*! -\page qml-dynamicview-tutorial3.html \title QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items \contentspage QML Dynamic View Ordering Tutorial \previouspage QML Dynamic View Ordering Tutorial 2 - Dragging View Items @@ -182,7 +179,6 @@ property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} a */ /*! -\page qml-dynamicview-tutorial4.html \title QML Dynamic View Ordering Tutorial 4 - Sorting Items \contentspage QML Dynamic View Ordering Tutorial \previouspage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items |