Skip to content

Commit

Permalink
.travis.yml: Remove superfluous environments for qt4
Browse files Browse the repository at this point in the history
  • Loading branch information
@olesalscheider
olesalscheider committed Jun 23, 2018
1 parent ed6b199 commit 60d0fb3
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions .travis.yml
View file
Expand Up @@ -6,16 +6,9 @@ compiler:
- gcc - gcc
- clang - clang
env: env:
- QT_SELECT=qt4 ; CONFIG=minimal - CONFIG=minimal
- QT_SELECT=qt4 ; CONFIG=minimal-static - CONFIG=full
- QT_SELECT=qt4 ; CONFIG=full - CONFIG=full-debug
- QT_SELECT=qt4 ; CONFIG=full-debug
- QT_SELECT=qt4 ; CONFIG=full-static
- QT_SELECT=qt5 ; CONFIG=minimal
- QT_SELECT=qt5 ; CONFIG=minimal-static
- QT_SELECT=qt5 ; CONFIG=full
- QT_SELECT=qt5 ; CONFIG=full-debug
- QT_SELECT=qt5 ; CONFIG=full-static
install: install:
- tests/travis/install-build-depends - tests/travis/install-build-depends
script: script:
Expand Down

3 comments on commit 60d0fb3

@jlaine
Copy link
Contributor

@jlaine jlaine commented on 60d0fb3 Jun 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Speaking of updates to .travis.yml, if we're supporting both qmake and cmake, they need to be tested

@olesalscheider
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Just to clarify: Do you want to support both for building qxmpp? Because the MR from me switched from qmake to cmake, but I could bring back the qmake .pro files... Or are you talking about building a project with qmake that uses qxmpp?

@jlaine
Copy link
Contributor

@jlaine jlaine commented on 60d0fb3 Jun 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad if qmake's gone, no need for additional tests.

Please sign in to comment.