New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a qmake CONFIG feature file #101

Merged
merged 2 commits into from Oct 29, 2016

Conversation

Projects
None yet
3 participants
@jankusanagi
Contributor

jankusanagi commented Jun 27, 2016

.prf file provided as requested in #100

It's a rough adaptation of the feature file provided by the QtOAuth library. There are things I don't really understand, and conditionals for platforms I don't use, but it can be used as a starting point.

It will certainly make life easier (and safer) for people creating qmake-based projects which link to QXMPP, especially considering how some distributions might provide both Qt4 and Qt5 builds of QXMPP with different sonames and such.

I've tested it on my system, by copying the new file to /usr/lib/qt{4|5}/mkspecs/features/ and using "CONFIG += qxmpp" on my .pro file, and it works as expected.

Cheers!

@Kaffeine

This comment has been minimized.

Show comment
Hide comment
@Kaffeine

Kaffeine Sep 3, 2016

Contributor

@jlaine , can you please restart travis-ci build for this PR?
Even if you would not accept it, it would be better for everyone to know does it break build or not.

As far, as I see, this change do not affect build anyhow, so there should be a green light.

Edit: My mistake again. @jlaine , sorry for the noise.
@jankusanagi, it seems that you need to rebase the PR on master to have a green light, even if it makes little or no sense and the change itself is not covered by tests.

Contributor

Kaffeine commented Sep 3, 2016

@jlaine , can you please restart travis-ci build for this PR?
Even if you would not accept it, it would be better for everyone to know does it break build or not.

As far, as I see, this change do not affect build anyhow, so there should be a green light.

Edit: My mistake again. @jlaine , sorry for the noise.
@jankusanagi, it seems that you need to rebase the PR on master to have a green light, even if it makes little or no sense and the change itself is not covered by tests.

@jankusanagi

This comment has been minimized.

Show comment
Hide comment
@jankusanagi

jankusanagi Sep 20, 2016

Contributor

I don't know about the CI checks, but right above this comment box it states "This branch has no conflicts with the base branch" and a nice green check icon...

Contributor

jankusanagi commented Sep 20, 2016

I don't know about the CI checks, but right above this comment box it states "This branch has no conflicts with the base branch" and a nice green check icon...

@jankusanagi

This comment has been minimized.

Show comment
Hide comment
@jankusanagi

jankusanagi Sep 20, 2016

Contributor

Apparently pulling from your master branch to my clone helped the CI checks... all green now, @Kaffeine.

Contributor

jankusanagi commented Sep 20, 2016

Apparently pulling from your master branch to my clone helped the CI checks... all green now, @Kaffeine.

@jankusanagi

This comment has been minimized.

Show comment
Hide comment
@jankusanagi

jankusanagi Oct 24, 2016

Contributor

Hmm... ping? =)

Contributor

jankusanagi commented Oct 24, 2016

Hmm... ping? =)

@jlaine jlaine merged commit 15293eb into qxmpp-project:master Oct 29, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jlaine

This comment has been minimized.

Show comment
Hide comment
@jlaine

jlaine Oct 29, 2016

Contributor

Thanks for your patch! Should we be modifying our .pro file to install this?

Contributor

jlaine commented Oct 29, 2016

Thanks for your patch! Should we be modifying our .pro file to install this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment