summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/doc')
-rw-r--r--src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc12
-rw-r--r--src/widgets/doc/snippets/macmainwindow.mm2
-rw-r--r--src/widgets/doc/src/graphicsview.qdoc2
-rw-r--r--src/widgets/doc/src/model-view-programming.qdoc28
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/focus.qdoc4
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/styles.qdoc2
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc8
-rw-r--r--src/widgets/doc/src/widgets-tutorial.qdoc4
8 files changed, 34 insertions, 28 deletions
diff --git a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
index ef9f1fe919..efb0b33cd1 100644
--- a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
+++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
@@ -360,7 +360,8 @@ QSpinBox::down-button { height: 10px }
//! [59]
-/* implicitly sets the size of down-button to the size of spindown.png */
+// implicitly sets the size of down-button to the
+// size of spindown.png
QSpinBox::down-button { image: url(:/images/spindown.png) }
//! [59]
@@ -489,7 +490,8 @@ QDialog { etch-disabled-text: 1 }
QLabel { border-color: red } /* red red red red */
QLabel { border-color: red blue } /* red blue red blue */
QLabel { border-color: red blue green } /* red blue green blue */
-QLabel { border-color: red blue green yellow } /* red blue green yellow */
+QLabel { border-color: red blue green yellow }
+/* red blue green yellow */
//! [82]
@@ -522,7 +524,8 @@ QTextEdit {
/* linear gradient from white to green */
QTextEdit {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
- stop:0 white, stop: 0.4 rgba(10, 20, 30, 40), stop:1 rgb(0, 200, 230, 200))
+ stop:0 white, stop: 0.4 rgba(10, 20, 30, 40),
+ stop:1 rgb(0, 200, 230, 200))
}
@@ -549,7 +552,8 @@ QTextEdit {
QMessageBox {
dialogbuttonbox-buttons-have-icons: true;
dialog-ok-icon: url(ok.svg);
- dialog-cancel-icon: url(cancel.png), url(grayed_cancel.png) disabled;
+ dialog-cancel-icon: url(cancel.png),
+ url(grayed_cancel.png) disabled;
}
//! [86]
diff --git a/src/widgets/doc/snippets/macmainwindow.mm b/src/widgets/doc/snippets/macmainwindow.mm
index e1df77089c..d0d74631ab 100644
--- a/src/widgets/doc/snippets/macmainwindow.mm
+++ b/src/widgets/doc/snippets/macmainwindow.mm
@@ -269,7 +269,7 @@ MacMainWindow::MacMainWindow()
textedit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
textedit->setText("<br><br><br><br><br><br><center><b>This demo shows how to create a \
Qt main window application that has the same appearance as other \
- Mac OS X applications such as Mail or iTunes. This includes \
+ OS X applications such as Mail or iTunes. This includes \
customizing the item views and QSplitter and wrapping native widgets \
such as the search field.</b></center>");
diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc
index 3b0d841d53..6895466977 100644
--- a/src/widgets/doc/src/graphicsview.qdoc
+++ b/src/widgets/doc/src/graphicsview.qdoc
@@ -491,7 +491,7 @@
not supported. For example, you can create decorated windows by
passing the Qt::Window window flag to QGraphicsWidget's constructor,
but Graphics View currently doesn't support the Qt::Sheet and
- Qt::Drawer flags that are common on Mac OS X.
+ Qt::Drawer flags that are common on OS X.
The capabilities of QGraphicsWidget are expected to grow depending
on community feedback.
diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc
index 8fee91f0e5..098bb39fe2 100644
--- a/src/widgets/doc/src/model-view-programming.qdoc
+++ b/src/widgets/doc/src/model-view-programming.qdoc
@@ -354,7 +354,7 @@
the above code indicates, we need to supply more information when obtaining
a model index.
- \table
+ \table 70%
\row \li \inlineimage modelview-tablemodel.png
\li \b{Rows and columns}
@@ -386,7 +386,7 @@
\snippet code/doc_src_model-view-programming.cpp 3
- \table
+ \table 70%
\row \li \inlineimage modelview-treemodel.png
\li \b{Parents, rows, and columns}
@@ -417,7 +417,7 @@
\snippet code/doc_src_model-view-programming.cpp 6
- \table
+ \table 70%
\row \li \inlineimage modelview-roles.png
\li \b{Item roles}
@@ -902,7 +902,7 @@
The table below highlights the differences between current item and
selected items.
- \table
+ \table 70%
\header
\li Current Item
\li Selected Items
@@ -1557,7 +1557,7 @@
of items. The selection mode works in the same way for all of the
above widgets.
- \table
+ \table 70%
\row
\li \image selection-single.png
\li \b{Single item selections:}
@@ -1957,7 +1957,7 @@
To provide read-only access to data provided by a model, the following functions
\e{must} be implemented in the model's subclass:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::flags()}{flags()}
\li Used by other components to obtain information about each item provided by
the model. In many models, the combination of flags should include
@@ -1982,7 +1982,7 @@
Additionally, the following functions \e{must} be implemented in direct subclasses
of QAbstractTableModel and QAbstractItemModel:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::columnCount()}{columnCount()}
\li Provides the number of columns of data exposed by the model. List models do not
provide this function because it is already implemented in QAbstractListModel.
@@ -1994,7 +1994,7 @@
functions to allow rows and columns to be inserted and removed. To enable
editing, the following functions must be implemented correctly:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::flags()}{flags()}
\li Must return an appropriate combination of flags for each item. In particular,
the value returned by this function must include \l{Qt::ItemIsEditable} in
@@ -2024,7 +2024,7 @@
ensure that the appropriate functions are called to notify attached views and
delegates:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::insertRows()}{insertRows()}
\li Used to add new rows and items of data to all types of model.
Implementations must call
@@ -2119,7 +2119,7 @@
structure, it is up to each model subclass to create its own model indexes
by providing implementations of the following functions:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::index()}{index()}
\li Given a model index for a parent item, this function allows views and delegates
to access children of that item. If no valid child item - corresponding to the
@@ -2164,7 +2164,7 @@
The following types are used to store information about
each item as it is streamed into a QByteArray and stored in a QMimeData object:
- \table 90%
+ \table 70%
\header \li Description \li Type
\row \li Row \li int
\row \li Column \li int
@@ -2180,7 +2180,7 @@
export items of data in specialized formats by reimplementing the following
function:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::mimeData()}{mimeData()}
\li This function can be reimplemented to return data in formats other
than the default \c{application/x-qabstractitemmodeldatalist} internal
@@ -2215,7 +2215,7 @@
To take advantage of QAbstractItemModel's default implementation for the built-in
MIME type, new models must provide reimplementations of the following functions:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::insertRows()}{insertRows()}
\li {1, 2} These functions enable the model to automatically insert new data using
the existing implementation provided by QAbstractItemModel::dropMimeData().
@@ -2228,7 +2228,7 @@
To accept other forms of data, these functions must be reimplemented:
- \table 90%
+ \table 70%
\row \li \l{QAbstractItemModel::supportedDropActions()}{supportedDropActions()}
\li Used to return a combination of \l{Qt::DropActions}{drop actions},
indicating the types of drag and drop operations that the model accepts.
diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index 7add31a194..d7a2361dda 100644
--- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
@@ -162,13 +162,13 @@
\section2 The User Rotates the Mouse Wheel
On Microsoft Windows, mouse wheel usage is always handled by the
- widget that has keyboard focus. On Mac OS X and X11, it's handled by
+ widget that has keyboard focus. On OS X and X11, it's handled by
the widget that gets other mouse events.
The way Qt handles this platform difference is by letting widgets move
the keyboard focus when the wheel is used. With the right focus policy
on each widget, applications can work idiomatically correctly on
- Windows, Mac OS X, and X11.
+ Windows, OS X, and X11.
\section2 The User Moves the Focus to This Window
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index c15281cb69..0a5a079969 100644
--- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -115,7 +115,7 @@
The widget is passed as the last argument in case the style needs
it to perform special effects (such as animated default buttons on
- Mac OS X), but it isn't mandatory.
+ OS X), but it isn't mandatory.
In the course of this section, we will look at the style elements,
the style options, and the functions of QStyle. Finally, we describe
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 8dbc716027..fc3ac345a8 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -80,7 +80,7 @@
the QPalette::Button role to red for a QPushButton to obtain a
red push button. However, this wasn't guaranteed to work for all
styles, because style authors are restricted by the different
- platforms' guidelines and (on Windows XP and Mac OS X) by the
+ platforms' guidelines and (on Windows XP and OS X) by the
native theme engine.
Style sheets let you perform all kinds of customizations that are
@@ -121,7 +121,7 @@
\row \li \inlineimage stylesheet-coffee-cleanlooks.png
\li \inlineimage stylesheet-pagefold-mac.png
\row \li Coffee theme running on Ubuntu Linux
- \li Pagefold theme running on Mac OS X
+ \li Pagefold theme running on OS X
\endtable
When a style sheet is active, the QStyle returned by QWidget::style()
@@ -130,7 +130,7 @@
otherwise forwards the drawing operations to the underlying,
platform-specific style (e.g., QWindowsXPStyle on Windows XP).
- Since Qt 4.5, Qt style sheets fully supports Mac OS X.
+ Since Qt 4.5, Qt style sheets fully supports OS X.
*/
@@ -3745,7 +3745,7 @@
\snippet code/doc_src_stylesheet.qdoc 135
If you want the scroll buttons of the scroll bar to be placed together
- (instead of the edges) like on Mac OS X, you can use the following
+ (instead of the edges) like on OS X, you can use the following
stylesheet:
\snippet code/doc_src_stylesheet.qdoc 136
diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc
index 31d8c612e9..a337a7a487 100644
--- a/src/widgets/doc/src/widgets-tutorial.qdoc
+++ b/src/widgets/doc/src/widgets-tutorial.qdoc
@@ -110,7 +110,7 @@
make sure that the executable is on your path, or enter its
full location.
- \li On Linux/Unix and Mac OS X, type \c make and press
+ \li On Linux/Unix and OS X, type \c make and press
\uicontrol{Return}; on Windows with Visual Studio, type \c nmake and
press \uicontrol{Return}.
@@ -160,6 +160,7 @@
\table
\row
\li \snippet tutorials/widgets/childwidget/main.cpp main program
+ \row
\li \inlineimage widgets-tutorial-childwidget.png
\endtable
\enddiv
@@ -182,6 +183,7 @@
\table
\row
\li \snippet tutorials/widgets/windowlayout/main.cpp main program
+ \row
\li \inlineimage widgets-tutorial-windowlayout.png
\endtable
\enddiv
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 05:23:46 +0000