summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qdrag.cpp
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-05-28 12:45:48 +0200
committerNico Vertriest <nico.vertriest@digia.com>2015-06-30 07:33:31 +0000
commita7f2af09114cfa0996794c85bc48a601f665772d (patch)
treea36d84d2026c90ba866954cb1ec7e4f7f7429ffe /src/gui/kernel/qdrag.cpp
parent592f355271df09c791682650a64ef42ffe898a27 (diff)
Replace MAC OS X with OS X
Task-number: QTBUG-46374 Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/gui/kernel/qdrag.cpp')
-rw-r--r--src/gui/kernel/qdrag.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 723b83d338..2736fac8e0 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -218,7 +218,7 @@ QObject *QDrag::target() const
from are specified in \a supportedActions. The default proposed action will be selected
among the allowed actions in the following order: Move, Copy and Link.
- \b{Note:} On Linux and Mac OS X, the drag and drop operation
+ \b{Note:} On Linux and OS X, the drag and drop operation
can take some time, but this function does not block the event
loop. Other events are still delivered to the application while
the operation is performed. On Windows, the Qt event loop is
@@ -240,7 +240,7 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions)
The \a defaultDropAction determines which action will be proposed when the user performs a
drag without using modifier keys.
- \b{Note:} On Linux and Mac OS X, the drag and drop operation
+ \b{Note:} On Linux and OS X, the drag and drop operation
can take some time, but this function does not block the event
loop. Other events are still delivered to the application while
the operation is performed. On Windows, the Qt event loop is