> On July 12, 2014, 6:49 p.m., David Faure wrote: > > Seems clear enough. > > > > In KF5 the file is in frameworks/kwindowsystem/src/kwindowinfo_mac.cpp > > Marko Käning wrote: > Thanks for the info about KF5! > > Which branch should this be committed to on kdelibs4? Simply on master or > also on (an)other branch(es)? > > David Faure wrote: > Commit to KDE/4.13, and merge (or ask someone to merge) to KDE/4.14 and > master. > > [Or if you don't care for the 4.13 branch on mac, commit to KDE/4.14 > directly and merge to master.] > > Marko Käning wrote: > I have committed this to KDE/4.13 no problem in > http://commits.kde.org/kdelibs/d32b52996ce48d484bbf54a62321872a482e8d74 but I > am unsure about how to MERGE this properly into KDE/4.14 and master without > effecting other files. > > Can someone jump in and explain how to achieve those two merges without > cherry-picking using git?
I have done the merging to KDE/4.14 and master, it had the usual conflicts due to version number changes, so not trivial to explain. Please commit a fix for KF5 directly. - David ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/119240/#review62201 ----------------------------------------------------------- On July 14, 2014, 9:49 p.m., Marko Käning wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/119240/ > ----------------------------------------------------------- > > (Updated July 14, 2014, 9:49 p.m.) > > > Review request for KDE Software on Mac OS X, kdelibs, David Faure, Martin > Gräßlin, Ian Wadham, Thomas Lübking, and RJVB Bertin. > > > Bugs: 337154 > http://bugs.kde.org/show_bug.cgi?id=337154 > > > Repository: kdelibs > > > Description > ------- > > Preventing a crash in the KWindowInfo::Private destructor on OSX (thanks to > René J.V. Bertin) for Qt4! > > (Unclear is atm where this would have to be fixed in KF5.) > > See also this: > https://developer.apple.com/library/mac/documentation/CoreFoundation/Reference/CFTypeRef/Reference/reference.html#//apple_ref/c/func/CFRelease > > > Diffs > ----- > > kdeui/windowmanagement/kwindowinfo_mac.cpp > ca502a3c643af36f4a52bb6dcbc7b54fbe3f42a9 > > Diff: https://git.reviewboard.kde.org/r/119240/diff/ > > > Testing > ------- > > For more details see associated bug > > > Thanks, > > Marko Käning > >
