diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
commit | 6239af6f0f15871e02a516c97c5f1775743d352b (patch) | |
tree | 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /src/widgets/widgets/qmacnativewidget_mac.mm | |
parent | 3dc47622a469ded1c99397fdedc2053b73d57189 (diff) | |
parent | 6654a05fcad565a302e205e7f7deaa0b2757082d (diff) |
Merge branch 'release' into stable
Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
Diffstat (limited to 'src/widgets/widgets/qmacnativewidget_mac.mm')
-rw-r--r-- | src/widgets/widgets/qmacnativewidget_mac.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmacnativewidget_mac.mm b/src/widgets/widgets/qmacnativewidget_mac.mm index 27ce9317ba..240bd6d92e 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.mm +++ b/src/widgets/widgets/qmacnativewidget_mac.mm @@ -72,10 +72,6 @@ \snippet qmacnativewidget/main.mm 0 - On Carbon, this would do the equivalent: - - \snippet qmacnativewidget/main.mm 1 - Note that QMacNativeWidget requires knowledge of Carbon or 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 |