diff options
| author | Karel Kočí <cynerd@email.cz> | 2017-12-11 21:44:32 +0100 | 
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2017-12-11 21:44:32 +0100 | 
| commit | 7bca6e89a438f6df52fd022f881ba6af1f1eea54 (patch) | |
| tree | 6e9cae88a3c00d1ef3e16a9fa7e87447c4da56b2 | |
| parent | 4e55c50c55eb34bc771fe7fa5d18d5e8d175ead8 (diff) | |
| download | qtmips-7bca6e89a438f6df52fd022f881ba6af1f1eea54.tar.gz qtmips-7bca6e89a438f6df52fd022f881ba6af1f1eea54.tar.bz2 qtmips-7bca6e89a438f6df52fd022f881ba6af1f1eea54.zip | |
Fix qt5 qmake not found on some distributions and todo
| -rw-r--r-- | TODO.md | 1 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | tests/test.sh | 2 | 
3 files changed, 3 insertions, 2 deletions
| @@ -2,3 +2,4 @@  * Gui  * Full unprivileged instructions support  * Windows support +* Allow running tests with existing mips compiler instead of building its own @@ -5,6 +5,6 @@ mkdir -p build  ROOT="$(dirname "$(readlink -f "$0")")"  cd build -/usr/lib/qt5/bin/qmake "$ROOT" +qtchooser -run-tool=qmake -qt=5 "$ROOT"  make sub-qtmips_cli sub-qtmips_gui diff --git a/tests/test.sh b/tests/test.sh index d04d380..1302bf4 100644 --- a/tests/test.sh +++ b/tests/test.sh @@ -68,7 +68,7 @@ qtmips_make() {  	mkdir -p "$BUILD_DIR"  	local ORIG="$(pwd)"  	cd "$BUILD_DIR" -	/usr/lib64/qt5/bin/qmake "$PROJECT_ROOT" || echo_fail "QtMips qmake failed!" +	qtchooser -run-tool=qmake -qt=5 "$PROJECT_ROOT" || echo_fail "QtMips qmake failed!"  	make "$@" || echo_fail "QtMips build failed! (target: $@)"  	cd "$ORIG"  } | 
