[Development] Qt 5.5.0 header diff: QtWidgets.diff

[Marc Mutz]

On Tuesday 09 June 2015 17:40:59 Sorvig Morten wrote:
> > On 08 Jun 2015, at 11:07, Marc Mutz <marc.mutz at kdab.com> wrote:
> > 
> > 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
> 
> That diff is actually for src/widgets/widgets/qmacnativewidget_mac.h .
> 
> Change in question is cf5e5570.

Ok, looks good then (ftr: no definition was present for the function)

-- 
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