Fix stupid syntax errors

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-10-15 22:17:58 -04:00
parent b5a5035c09
commit ea577aa8f2
3 changed files with 3 additions and 2 deletions

View file

@ -43,7 +43,7 @@ before_install:
script: script:
- export CMAKE_PREFIX_PATH=$PWD/Qt/5.9.1/gcc_64/lib/cmake ; - export CMAKE_PREFIX_PATH=$PWD/Qt/5.9.1/gcc_64/lib/cmake ;
cd .. ; cd .. ;
bash -e ./subsurface/scripts/build.sh -both -no-bt bash -e ./subsurface/scripts/build.sh -both -no-bt ;
bash -e ./subsurface/scripts/build.sh -both bash -e ./subsurface/scripts/build.sh -both
- env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check
# - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build-mobile check # - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build-mobile check

View file

@ -81,7 +81,7 @@ extern "C" int gitProgressCB(const char *text)
return 0; return 0;
} }
#if defined(BT_SUPPOR) #if defined(BT_SUPPORT)
void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state) void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state)
{ {
BTDiscovery *btDiscovery = BTDiscovery::instance(); BTDiscovery *btDiscovery = BTDiscovery::instance();

View file

@ -30,6 +30,7 @@ while [[ $# -gt 0 ]] ; do
-no-bt) -no-bt)
# force Bluetooth support off # force Bluetooth support off
BTSUPPORT="OFF" BTSUPPORT="OFF"
;;
-build-deps) -build-deps)
# in order to build the dependencies on Mac for release builds (to deal with the macosx-version-min for those # in order to build the dependencies on Mac for release builds (to deal with the macosx-version-min for those
# call this script with -build-deps # call this script with -build-deps