Skip to content

Commit

Permalink
Use Qt 5.4.2 in travis CI build
Browse files Browse the repository at this point in the history
5.4.1 is no longer in the beineri PPA.

test_click_action_in_overflow has been modified to wait
longer as 400 is not long enough under 5.4.2.

- Fixes papyros#326
  • Loading branch information
malwoden committed Oct 24, 2015
1 parent 42da3ad commit e415e3b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ before_install:
- "sh -e /etc/init.d/xvfb start"

install:
- sudo add-apt-repository -y ppa:beineri/opt-qt541
- sudo add-apt-repository -y ppa:beineri/opt-qt542
- sudo apt-get update
- sudo apt-get -y install pep8 pyflakes python python-pip npm
- sudo apt-get -y install qt54declarative
Expand Down
2 changes: 1 addition & 1 deletion tests/tst_actionbar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Rectangle {
compare(action4Spy.count, 0)
mouseClick(button, 10, 10)

wait(400) // Wait for the overflow to fully open
wait(800) // Wait for the overflow to fully open

verify(overflow.showing)
mouseClick(listItem, 10, 10)
Expand Down

0 comments on commit e415e3b

Please sign in to comment.