Skip to content

Commit

Permalink
Merge pull request #10 from SatoshiShimada/modify_unittest
Browse files Browse the repository at this point in the history
Modify Unit Test rules
  • Loading branch information
SatoshiShimada authored Dec 21, 2018
2 parents 32fc133 + 257584e commit f39630b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: cpp
dist: xenial
sudo: false
matrix:
include:
- env: QT_VERSION=qt5
os: linux
dist: xenial # Ubuntu 16.04 LTS
compiler: gcc
addons:
apt:
Expand All @@ -17,6 +17,7 @@ matrix:
- env: QT_VERSION=qt5
os: linux
compiler: clang
dist: xenial # Ubuntu 16.04 LTS
addons:
apt:
packages:
Expand All @@ -28,10 +29,6 @@ matrix:
os: osx
osx_image: xcode9.2
compiler: gcc
- env: QT_VERSION=qt5
os: osx
osx_image: xcode8
compiler: gcc
- env: QT_VERSION=qt5
os: osx
osx_image: xcode9.2
Expand All @@ -41,3 +38,4 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --force qt; fi
script: ./qt_make.sh

16 changes: 14 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,29 @@ Please check Wiki for more information.

* [Qt](https://www.qt.io/) (Version: 5.3 or greater)
* gcc (only Linux)
* XCode (only Mac OS)
* XCode (only Mac OS)(Version: 9 or greater)
* Visual Studio (only Windows)

## How to build

### Linux (Ubuntu 14.04)

1. Install libraries.

```shell
apt install build-essential
```

This application require Qt 5.3 or greater.
But, Qt version is 5.2 if install using `apt-get`.
You need install Qt from source code.

### Linux (Ubuntu 16.04)

1. Install libraries.

```
apt install qt5-default
apt install build-essential qt5-default qt5-qmake qtbase5-dev-tools qtmultimedia5-dev
```

2. Build application.
Expand Down

0 comments on commit f39630b

Please sign in to comment.