[Development] Qt 5.5.0 header diff: QtWidgets.diff
Marc Mutz
marc.mutz at kdab.com
Mon Jun 8 11:07:26 CEST 2015
On Friday 05 June 2015 10:11:27 Frederik Gladhorn wrote:
> diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
> b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h index a98d30f..5920c1f
> 100644
> --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
> +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
> @@ -52,7 +52,6 @@ public:
> NSView *nativeView() const;
>
> protected:
> - void init(NSView *parentView);
> bool event(QEvent *ev);
>
> private:
This diff seems wrong. In Qt 5.5, the header
src/widgets/widgets/qmaccocoaviewcontainer_mac.h looks like this:
QT_BEGIN_NAMESPACE
class QMacCocoaViewContainerPrivate;
class Q_WIDGETS_EXPORT QMacCocoaViewContainer : public QWidget
{
Q_OBJECT
public:
QMacCocoaViewContainer(NSView *cocoaViewToWrap, QWidget *parent = 0);
virtual ~QMacCocoaViewContainer();
void setCocoaView(NSView *view);
NSView *cocoaView() const;
private:
Q_DECLARE_PRIVATE(QMacCocoaViewContainer)
};
QT_END_NAMESPACE
--
Marc Mutz <marc.mutz at kdab.com> | Senior Software Engineer
KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company
Tel: +49-30-521325470
KDAB - The Qt Experts
More information about the Development
mailing list