| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qt is updated to 5.12.5, MSVC is updated to 2017. Qbs is updated to
1.15.0.
Docker-compose is used for managing the image. A unique tag name is used
instead of the generic windowsservercore tag to be always able to refer
to a specific version. Docker-compose is now used for managing the
image.
Change-Id: Ia5733992e7692561b1a6e74a4ac2ea3a7a01c4d8
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I2f0d72abdf12a4e64b79bf9a3c02b32cf4cbeed6
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conan is a popular C/C++ package manager. Conan packages including their
configuration and dependencies are usually described as conanfile.txt/.py.
ConanfileProbe runs 'conan install -g json' and parses the resulting
conanbuildinfo.json. The resulting JS object tree contains relevant information
about the dependencies and can be used to set module properties in Product,
Profile or even Module items.
Change-Id: Ied6b917f061dac67fb2260eab099bcce4037750d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
The job fails quite often. Build it only on master instead.
Change-Id: Ice52cb0eff51870ef49e97d961549ad92e46df44
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I90865ba6908df1550c2646a57d348dcb82e244ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
Some GCC tests were skipped on Mac because of the empty qbs.toolchain
value
Change-Id: I977eecad416ffd074f6e997c71da12c0a4ee8ace
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ie5ac3de1b6f1505ddf79a775dcfdedc9afaedae8
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Before qt 5.14.
The profile property "moduleProviders.Qt.qmakeFilePaths" is set with one or more
paths to the different android architectures. Each qmake path belongs to a
different android architecture installation.
So each qmake is used to generated the Qt module corresponding to the architecture.
Although qbs can generate multi-arch apks using multiplex mode, this is not
possible when the project depends on qt libraries. This is because of the
restriction of the qt tool androiddeployqt used by qbs.
Now with qt 5.14.
All android architectures are installed in the same directory.
So the profile property "moduleProviders.Qt.qmakeFilePaths" is set with one
qmake path.
This directly impacts the qbs-setup-android tool and the generation of
the Qt modules.
Because qt libraries are installed in the the same directory, they have the
abi in their name (libQt5Core_armeabi-v7a.so).
So the rules that generate the apks are also impacted.
The new androiddeployqt have a new interface (json config file format and requires
to have the input libraries installed in the deployment directory) which allows
the generation of multi-arch apks.
So Qt.android_support modules needs to be updated as well.
Fixes: QBS-1497
Change-Id: Ibd546f356c38a05f42dfcac0a4ec92bd82d6f700
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: Idc361a825c208020e2c87971383845ad95fab54e
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QT_INSTALL_DIR is defined as global environment variable and is overrideen with
a different value in the windows job. Something changed in the way Travis parses
environment variables and the override is exported after depend variables.
Since we run the build in a bash shell, there is no reason to set QT_INSTALL_DIR
to a different value than ~/Qt. We can safely remove the override.
Change-Id: Id556997b3a9d8a8d6be474485b5084955a09f253
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
It is confusing that we set 32-bit base profile for the 64-bit Qt
Change-Id: I91f69b7662698aefd3c09b203f9192251121d984
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This is still the default one on Travis and Qbs should support it
Also, only build XCode10 variant on master to avoid extra job for gerrit
builds
Change-Id: I100e7e4560aeca3c2c3d77d81ecc9097853e0a2d
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I6a7267f55e7041fda7213bedf117870460b262b3
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Docker images contains ndk r20 and qt 5.13.2 as well as 5.14.0. Containers
can be started with the following command line:
- docker-compose pull bionic-android-513
- docker-compose run --rm bionic-android-513
The current folder is mounted under /qbs. Assuming that Qbs has been built in
the current directory and with release configuration, the autotests can be
invoked with:
docker-compose run --rm bionic-android-513 scripts/test-qt-for-android.sh \
release/install-root/usr/local/bin
A job Travis CI job is added which builds Qt and runs the Android blackbox
tests.
Change-Id: I76b1901cb7c41f8b5b0122265c99c9b37b59f261
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
Version 3.6.8 seems to be down quite often for whatever reason. Maybe selecting
just "some" version is more stable.
Change-Id: I4862c82ae0da38d5d942d77607db4e2312b49ae0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This runs predefined clang-tidy checks on the QBS sources, excluding
examples and tests
Most checks are displayed as warings, however, some checks are treated
as errors to avoid adding regressions in the new code
clang-analyzer-* checks are not enabled due to performance reasons
(otherwise, Travis job hits 50 min)
Change-Id: I686003d2526a11d90fc74c88104b4357d67620d1
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Works like ccache on Linux/macOS, but ccache-alike invocation requires an
unreleased version.
Change-Id: Ib206eef9d34514aa4a087cf38883241d58ee3992
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This speeds up CI builds a lot.
Change-Id: I53962e1683b4dd923c3a7d254db24164a4e623a6
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Cold Cache: 27:47 (XCode 10.2) / 31:08 (XCode 11.0)
Warm Cache: 22:53 (XCode 10.2) / 24:20 (XCode 11.0)
Change-Id: I68449a1b921a63d1102c58255a6badb3098b4170
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I45a6bbc31a5be8c20b0fe7877e1fc42833e68ddd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This requires Qbs 1.14.1. And while we are at it, we can also upgrade Qt to
5.12.6 in all environments.
Task-number: QBS-1495
Change-Id: Iddb067cca37956f93c9bdf2acc95b2282a232b2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Update also the docs to refer to the Ubuntu image rather than Debian.
Change-Id: I2c64f8f169c7a8ff9d5090ebc55c56bffd957659
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
They seem to no longer work and it is unclear whether they
were even needed.
Change-Id: I784ecca1920be16ff6712c3b26340328c58ce75c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
Also introduce accurate versioning for docker images. This
makes it possible to use different build environments in
different branches.
Change-Id: I4feb83dbba886c4369d661ec746428b0c89b80b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I97e475dbe493dbdd06491648ed1ebc767e7ff621
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Contains:
- Qbs 1.13.1 (from QtCreator 4.9.2)
- Qt 5.12.4 for Linux (prebuilt)
- Qt 5.12.4 for Windows (compiled from source)
- gcc 7.4
- mingw-w64 (7.3)
This image can build Qbs and all its components for Linux
and Windows targets. It might supersede Debian stretch which
is not officially supported by Qt 5.12.
The only limitation is that it can neither build Chocolatey
packages nor run windeployqt.
Change-Id: Icee1f002483f68839d39c8c152a9c5d886dabcfb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
One of the main problems in virtual environments like Travis CI is how to
install Qt and QtCreator. The official installer provided by the Qt Company is
almost unusable from command line. It is even harder to select only certain
components (especially QtScript). Luckily, all components are available online
under http://download.qt.io.
This script installs components from the official Qt package repository. It can
be used in any bash environment to simplify the setup procedure and supports
every valid combination of host OS, target platform (desktop, android, ios) as
well as toolchains.
Dependencies:
- bash
- curl
- 7z
Change-Id: Ia2080cb80df98551332eb02c85c5933fd3bdaa4e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This patch enables Qbs builds and autotests on Windows.
Builds in release mode to speed up test execution.
Change-Id: Iaddfddb3459266740aa18c06d431624336446c6b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
|
|
|
|
|
|
|
|
| |
It is possible to use relative path for the qmake's installation prefix
Change-Id: Ic66d7d336bc9998589f3bbee3512dc552ba7d0ad
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This patch enables Qbs builds and autotests on macOS X.
Address sanitizer has to be disabled because it slows
autotests down too much.
Change-Id: Id8b5ec4284881c8c7a4ac3ef612e979f10f67e1b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
This patch adds a configuration file for building and testing Qbs with Travis
CI. Travis supports Linux, Windows and Mac OS. It requires a repository on
github, but is generally free for open source projects. Users could simply fork
Qbs, connect their Travis account to the forked repository and let it build.
In addition to this patch, a bot has been implemented that watches
codereview.qt-project.org for changes. Whenever a user uploads a new change or
patch set, the bot pushes this change to a mirror repository on github and kicks
Travis to build it. Once the build has finished the result is posted as a
comment back to gerrit.
This bot could be extended to behave like the Qt CI system.
Change-Id: Ic0e1bd507171f40860bfe352651880b4ae7412fc
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|