Differential D3145

Fetch fileutils_mac.mm from qt-creator master
ClosedPublic
Actions

Authored by kfunk on Oct 23 2016, 4:52 PM.

Details

Reviewers
apol
• kaning
rjvbb
Commits
R32:b2b254e197e5: Fetch fileutils_mac.mm from qt-creator master
Summary

This is basically a cherry-pick of the patch from:

https://codereview.qt-project.org/#/c/140319/

Probably also fixes the following compile error on macOS Sierra:
:info:build In file included from
/opt/local/var/macports/build/_Users_marko_WC_GIT_macstrop_kf5_kdevelop5/kf5-kdevelop/work/kdevelop-5.0.2/languages/qmljs/libs/utils/autoreleasepool.h:35:
:info:build In file included from
/System/Library/Frameworks/Foundation.framework/Headers/NSAutoreleasePool.h:5:
:info:build
/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:44:12:
error: unknown property attribute 'class'
:info:build @property (class, readonly) BOOL supportsSecureCoding;
:info:build ^

Diff Detail

Repository
R32 KDevelop
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kfunk updated this revision to Diff 7624.Oct 23 2016, 4:52 PM
kfunk retitled this revision from to Fetch fileutils_mac.mm from qt-creator master.
kfunk updated this object.
kfunk edited the test plan for this revision. (Show Details)
Restricted Application added a subscriber: kdevelop-devel. · View Herald TranscriptOct 23 2016, 4:52 PM
apol accepted this revision.Oct 24 2016, 1:34 AM
apol added a reviewer: apol.
This revision is now accepted and ready to land.Oct 24 2016, 1:34 AM
kfunk added a reviewer: rjvbb.Oct 24 2016, 7:33 AM
This revision now requires review to proceed.Oct 24 2016, 7:33 AM
• kaning added a comment.Oct 24 2016, 7:46 AM

Will test this on macOS Sierra 10.12.1 Beta 5 as soon as I get to it.

• kaning added a comment.Oct 24 2016, 9:31 PM

First of all I don't experience the above described compile error on Sierra (anymore), i.e. it built fine without this patch.

But René's current kf5-kdevelop port makes use of quite a significant number of other patches to get it to build successfully.

rjvbb added a comment.EditedOct 24 2016, 9:52 PM
In D3145#58613, @kaning wrote:

But René's current kf5-kdevelop port makes use of quite a significant number of other patches to get it to build successfully.

Marko: I think the error went away for you when you stopped using the stock clang (macports-clang-3.8 or macports-clang-3.9), no?

I've been busy with some heavy-duty building (qtwebengine) but hope to find a moment soon to look into this.

• kaning added a comment.Oct 24 2016, 9:55 PM
In D3145#58624, @rjvbb wrote:

Marko: I think the error went away for you when you stopped using the stock clang (macports-clang-3.8 or macports-clang-3.9), no?

Oh, Jesus, yes, I totally forgot. I have to investigate that further, but not tonight anymore. ;-)

rjvbb added a comment.Oct 25 2016, 6:35 PM

KDevelop builds fine with this patch on OS X 10.9.5 .

Any real-world tests I can do to check for regressions?

rjvbb accepted this revision.Oct 25 2016, 6:37 PM
rjvbb edited edge metadata.
This revision is now accepted and ready to land.Oct 25 2016, 6:37 PM
• kaning added a comment.Oct 25 2016, 6:41 PM

Which compiler were you using on Mavericks, René?

rjvbb added a comment.Oct 25 2016, 7:03 PM

Which compiler were you using on Mavericks, René?

clang 3.9 from MacPorts. I already knew that Xcode's clang for 10.9 builds the patched code which comes from Qt Creator (which I've built with Xcode before).
Either way this was just to confirm that the patch doesn't introduce any regressions on an older OS X version on which the original code builds fine.

• kaning added a comment.Oct 25 2016, 7:05 PM

OK, so I don't need to carry out any further testing? Or is Sierra still important?

rjvbb added a comment.Oct 25 2016, 7:17 PM

Yes, it would be very nice if you could check if this solves the error you had and reported building kdevelop with stock clang 3.9 on 10.12 !

• kaning added a comment.Oct 25 2016, 7:18 PM

OK, so I guess you should add me as a reviewer here. ;)

• kaning accepted this revision.Oct 25 2016, 9:03 PM
• kaning edited edge metadata.

OK, I have applied said patch and built with clang++-mp-3.9 successfully on Sierra 10.12.1.

kfunk added a comment.Oct 25 2016, 9:11 PM

Thanks. Will push then.

Closed by commit R32:b2b254e197e5: Fetch fileutils_mac.mm from qt-creator master (authored by kfunk). · Explain WhyOct 25 2016, 9:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7658

View Options

languages/qmljs/libs/utils/autoreleasepool.h

Loading...
View Options

languages/qmljs/libs/utils/fileutils_mac.mm

Loading...