diff --git a/.travis.yml b/.travis.yml index 7c6ee33..6cded8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,30 @@ language: rust +rust: + - 1.41.0 matrix: include: # works on Precise and Trusty - os: linux - - dist: bionec + - dist: xenial compiler: clang addons: apt: - sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-7'] - packages: ['clang-7', 'g++-5'] + sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7'] + packages: ['clang-3.7', 'g++-5'] before_script: - export PATH="$PATH:$HOME/.cargo/bin" before_install: - - rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu + - rustup component add rustfmt --toolchain 1.41.0-x86_64-unknown-linux-gnu - gem install bundler - - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal + - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal - export PATH="$PATH:$HOME/.cargo/bin" - - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic -y + - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y - sudo apt-get update -qq + - sudo apt-get install libsodium-dev pkg-config - sudo apt-get install qt514base qt514websockets libgl1-mesa-dev - source /opt/qt514/bin/qt514-env.sh - chmod +x res/libsodium/buildlibsodium.sh diff --git a/application.qrc b/application.qrc index 5fc7a70..b5aa1a5 100644 --- a/application.qrc +++ b/application.qrc @@ -66,7 +66,6 @@ res/emoji/emoji1.png res/emoji/laughing.png res/emoji/money-mouth.png - res/emoji/sweet_smile.png res/emoji/joy.png res/emoji/innocent.png res/emoji/partying_face.png