summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@qt.io>2017-01-20 11:39:35 -0800
committerGabriel de Dietrich <gabriel.dedietrich@qt.io>2017-01-23 18:30:03 +0000
commitaa8fb3608952ab9f344e2b6beb7e083908c8d905 (patch)
treecea191e6475d615c1c7ad929ca65253a1cc953bf
parent40827457a7883bf2465b5365c9e95f38a59404d5 (diff)
QMacNativeWidget: Remove Carbon reference from documentation
Change-Id: Ie1f1064a98f202194cad98aa3fa106e87eba7f39 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--src/widgets/widgets/qmacnativewidget_mac.mm8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/widgets/qmacnativewidget_mac.mm b/src/widgets/widgets/qmacnativewidget_mac.mm
index 936bd35187..9ad8aa1305 100644
--- a/src/widgets/widgets/qmacnativewidget_mac.mm
+++ b/src/widgets/widgets/qmacnativewidget_mac.mm
@@ -65,15 +65,11 @@
but it cannot be shown on its own. It needs to be put into a window
when it is created or later through a native call.
- QMacNativeWidget works for either Carbon or Cocoa depending on how Qt was configured. If Qt is
- using Carbon, QMacNativeWidget will embed into Carbon hierarchies. If Qt is
- using Cocoa, QMacNativeWidget embeds into Cocoa hierarchies.
-
- Here is an example of putting a QPushButton into a NSWindow:
+ Here is an example showing how to put a QPushButton into a NSWindow:
\snippet qmacnativewidget/main.mm 0
- Note that QMacNativeWidget requires knowledge of Carbon or Cocoa. All it
+ Note that QMacNativeWidget requires knowledge of Cocoa. All it
does is get the Qt hierarchy into a window not owned by Qt. It is then up
to the programmer to ensure it is placed correctly in the window and
responds correctly to events.