diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 2 | ||||
| -rwxr-xr-x | scripts/build.sh | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d313fd2cb..5d3c9ad58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_install: script: - export CMAKE_PREFIX_PATH=$PWD/Qt/5.9.1/gcc_64/lib/cmake ; 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 - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check # - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build-mobile check diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 2f99ff41b..9df276d6f 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -81,7 +81,7 @@ extern "C" int gitProgressCB(const char *text) return 0; } -#if defined(BT_SUPPOR) +#if defined(BT_SUPPORT) void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state) { BTDiscovery *btDiscovery = BTDiscovery::instance(); diff --git a/scripts/build.sh b/scripts/build.sh index d61a91306..4861ad318 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -30,6 +30,7 @@ while [[ $# -gt 0 ]] ; do -no-bt) # force Bluetooth support off BTSUPPORT="OFF" + ;; -build-deps) # 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 |