1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Fix references to QGuiApplication::clipboard()

Browse Source 
QClipboard's documentation still referred to QApplication::clipboard(),
where the method was located in Qt4.

Change-Id: I7fc31bacf5afa783f8ca38723773f24cd0bda347
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Joerg Bornemann 2016-05-17 17:32:41 +02:00
parent b2e9c680e3
commit 9c0a7cac83
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
View File

@ -39,7 +39,7 @@
****************************************************************************/ ****************************************************************************/
//! [0] //! [0]
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QGuiApplication::clipboard();
QString originalText = clipboard->text(); QString originalText = clipboard->text();
... ...
clipboard->setText(newText); clipboard->setText(newText);

8
src/gui/kernel/qclipboard.cpp
View File

@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
Drop}. Drop}.
There is a single QClipboard object in an application, accessible There is a single QClipboard object in an application, accessible
as QApplication::clipboard(). as QGuiApplication::clipboard().
Example: Example:
\snippet code/src_gui_kernel_qclipboard.cpp 0 \snippet code/src_gui_kernel_qclipboard.cpp 0
@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE
\endlist \endlist
\sa QApplication \sa QGuiApplication
*/ */
/*! /*!
@ -141,7 +141,7 @@ QT_BEGIN_NAMESPACE
Do not call this function. Do not call this function.
Call QApplication::clipboard() instead to get a pointer to the Call QGuiApplication::clipboard() instead to get a pointer to the
application's global clipboard object. application's global clipboard object.
There is only one clipboard in the window system, and creating There is only one clipboard in the window system, and creating
@ -159,7 +159,7 @@ QClipboard::QClipboard(QObject *parent)
Destroys the clipboard. Destroys the clipboard.
You should never delete the clipboard. QApplication will do this You should never delete the clipboard. QGuiApplication will do this
when the application terminates. when the application terminates.
*/ */
QClipboard::~QClipboard() QClipboard::~QClipboard()