diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | doc/qbs.qdoc | 8 | ||||
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 13 |
5 files changed, 20 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index d37139695..208ae94a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: global: - QT_INSTALL_DIR=~/Qt - QT_VERSION=5.12.5 - - QTCREATOR_VERSION=4.9.2 + - QTCREATOR_VERSION=4.10.1 stages: - name: Build Qbs and and run autotests @@ -1 +1 @@ -1.15.0 +1.16.0 diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index 08a901365..852329f73 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -712,17 +712,17 @@ \li Latest stable release of \QBS for building \QBS with \QBS \endlist - Run the following command to download the \QBS development image based on Debian 9 \e Stretch: + Run the following command to download the \QBS development image based on Ubuntu 18.04 \e Bionic: \code - docker pull qbsbuild/qbsdev:stretch + docker pull qbsbuild/qbsdev:bionic \endcode You can then create a new container with the \QBS source directory mounted from your host machine's file system, by running: \code - docker run -it -v ${PWD}:/qbs -w /qbs qbsbuild/qbsdev:stretch + docker run -it -v ${PWD}:/qbs -w /qbs qbsbuild/qbsdev:bionic \endcode You will now be in an interactive Linux shell where you can develop and build \QBS. @@ -730,7 +730,7 @@ For convenience, you can also run \c docker-compose from the project root directory: \code - docker-compose run --rm stretch + docker-compose run --rm bionic \endcode This will download and run the container in one go and mount the project root directory diff --git a/docker-compose.yml b/docker-compose.yml index 654d3b8d4..f53d516c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,13 +12,13 @@ services: bionic: << : *linux hostname: bionic - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-3 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.14.0-1 build: dockerfile: docker/bionic/Dockerfile context: . args: QT_VERSION: 5.12.5 - QTCREATOR_VERSION: 4.9.2 + QTCREATOR_VERSION: 4.10.1 stretch: << : *linux diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index 7fe735ad9..10ba78045 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -8,6 +8,8 @@ Module { name: "cpp" } property bool enableAddressSanitizer: false + property bool enableUbSanitizer: false + property bool enableThreadSanitizer: false property bool enableUnitTests: false property bool enableProjectFileUpdates: false property bool enableRPath: true @@ -59,6 +61,15 @@ Module { } return flags; } - cpp.driverFlags: enableAddressSanitizer ? ["-fsanitize=address"] : [] + cpp.driverFlags: { + var flags = []; + if (enableAddressSanitizer) + flags.push("-fsanitize=address"); + if (enableUbSanitizer) + flags.push("-fsanitize=undefined"); + if (enableThreadSanitizer) + flags.push("-fsanitize=thread"); + return flags; + } } } |