make qmljs kdevelop plugin compile on OSX
ClosedPublic
Actions

Authored by amccann on Oct 27 2015, 11:43 PM.

Details

Reviewers

mwolff
apol
kfunk

Commits

R32:c99d8a9db5c4: make qmljs kdevelop plugin compile on OSX
R32:584240b54d50: make qmljs kdevelop plugin compile on OSX

Summary

It seems that when the qmljs plugin was ported over from qt-creator, the OSX specific files were left out.
fileutils_mac.mm
fileutils_mac.h
autoreleasepool.h

Note: I simply copied these over from HEAD of qt-creator git.

Upon inspection of the license headers of other files in that directory, this appears to match what was done before.

This does include a modification to CMakeLists.txt to add the object-c++ file to compilation.

Test Plan

Build on OSX

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.

amccann updated this revision to Diff 1068.Oct 27 2015, 11:43 PM

amccann retitled this revision from to make qmljs kdevelop plugin compile on OSX.

amccann updated this object.

amccann edited the test plan for this revision. (Show Details)

amccann added reviewers: kfunk, mwolff.

Restricted Application added a subscriber: kdevelop-devel. · View Herald TranscriptOct 27 2015, 11:43 PM

Looks good to me. Can you push?

This revision is now accepted and ready to land.Oct 28 2015, 12:09 AM

Closed by commit R32:584240b54d50: make qmljs kdevelop plugin compile on OSX (authored by amccann, committed by apol). · Explain WhyOct 28 2015, 12:48 AM

This revision was automatically updated to reflect the committed changes.

Hi,

Now that I have commit / developer privs.

Would it be OK if I cherry-picked this into the 5.0 branch?

(apol committed it to the master branch)

In D456#9002, @amccann wrote:

Hi,

Now that I have commit / developer privs.

Would it be OK if I cherry-picked this into the 5.0 branch?

(apol committed it to the master branch)

Go for it!

mwolff edited edge metadata.Oct 29 2015, 10:39 AM

mwolff added a project: KDevelop.

Revision Contents
Changeset List

		Path
M		languages/qmljs/libs/CMakeLists.txt (5 lines)
A	M	languages/qmljs/libs/utils/autoreleasepool.h (51 lines)
A	M	languages/qmljs/libs/utils/fileutils_mac.h (47 lines)
A	M	languages/qmljs/libs/utils/fileutils_mac.mm (90 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1068	c2330b2		Oct 27 2015, 11:43 PM	★	★
Diff 2	1069	818e1d8	Commit rKDEVELOP584240b54d50eeff55e05233e52d9b6d43fc049d	Oct 28 2015, 12:43 AM	★	★