| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Requied to be able to run clang-tidy
Change-Id: Ie0b6eb3229e8a93ea2e7dd10d75824fb40702fa6
Reviewed-by: Richard Weickelt <richard@weickelt.de>
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>
|
|
|
|
|
|
|
|
|
| |
The GLIB event dispatcher was disabled in order to work around
QTBUG-79020. But the environment variable was not exported properly
and hence, the work-around had no effect.
Change-Id: I9bad99168456ae734c895db0ed4f46885d6b4d48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Update qbs to 1.12.1
- Update Qt to 5.12.5
We're not using the installer anymore, because
a) the unattended-install-hack doesn't work for newer Qt installers
b) newer installers do not provide VS 2015 builds.
c) it allows us to tailor the Qt build to our needs in the future.
We're not building the documentation on Windows anymore due to the
genius move to require libclang for qdoc. That means we need
additional twiddling with the packages to add documentation that was
built on an usable OS.
Task-number: QBS-1438
Change-Id: I77a487562c2f5edd69b8b8a10ef3410ab599dc92
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Disable glib in the bionic Docker image, as the glib event
dispatcher leads to deadlocks in
TestBlackbox::concurrentExecutor quite often. The problem
should hardly occur in practice. This is a work-around until
QTBUG-79020 is fixed.
Fixes: QBS-1499
Change-Id: I8cecc979b1c13b053c0ee0787cc4bc0a0de8b701
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Makes it possible to start the container on a Linux host
where the uid/gid of the current user is similar to an
existing uid/gid in the container that is not the "devel"
user.
For instance, if the host gid is 100, then groupmod in the
entrypoint script refuses to change the "devel" user to gid
100 because that gid is already taken by the "apt" group in
the container.
Change-Id: Ifc4980b118b9b94bf744aa1108225d3c727eb644
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>
|
|
|
|
|
|
|
|
|
|
|
| |
Use the official packages instead of compiling Qt ourselves.
This simplifies the Docker image a lot. For accessing the
script folder, the Docker context needs to change to the
root directory. Thus, we need a .dockerignore file to keep
the size of the context low.
Change-Id: I58ec8f364feba955518f1eaf5bff234332ae8dec
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Libasan requires ptrace capabilities when running in Docker
- Provide a suppressions file
- Update stretch Docker image to build against libicu and match
the configure options of the official Qt release. Otherwise
the address sanitizer fails when Qbs loads plugins.
Change-Id: Ib620187a3cdd486eaf646ee0bd022b811744a998
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Extend Qt installation to enable Qbs autotests and building docs
(QtDeclarative and QtTools, libclang were missing).
- Add Qt to PATH in the container
- Allow users of docker-compose to override the Docker username
so that they can potentially use their own repositories
without changing the file.
- Fix error in the entrypoint script which didn't work when
running the container without arguments.
- Replace the non-interesting output of building Qt with dots because
the log exceeded the maximum log length on Travis CI,
but being entirely silent triggered the watchdog.
Task-number: QBS-1438
Change-Id: Ibd3abacadfc001db5169a9a3fffce908f8e6e760
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Debian Docker image is outdated and the user experience is not optimal,
especially when using it on Linux hosts.
- Update Qt to 5.11.3 and build it from source since the Qt installer
is overly complicated to use
- Create a Qt profile and make it the default
- Add entrypoint script to avoid file permission problems on Linux hosts
- Add docker-compose.yml file for easier command line usage
- Improve documentation
Task-number: QBS-1402
Task-number: QBS-1438
Change-Id: I2cbe53ed115fc8cbb96c1e1305297c581e7d0589
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Document it, and install the dependencies in the Docker images.
For the man page build, the installed version of the qbs app is now used
to get the help text rather than the non-installed version, since the
non-installed version may not be able to find all library dependencies
(like Qt) on some platforms by default. The build also now depends on
the other executables as well since their presence affects the output of
qbs --help.
Change-Id: Ic9896231aa76a346180bf30f7b2483391f5e4ea0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I360fbab406a0bd82dd0a09462585681625c1539c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: I40c1ea23e7351deac715958783158c089e65a02d
|
| |
| |
| |
| |
| | |
Change-Id: I59c4e38be62c41577f2953ac7f3cb3c7f2f1eb08
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ib18e50ecdc9be5f9deaebf68414c2082ddafcc8b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This should make release builds faster since all of the source files
don't need to be copied to a temporary directory. Qbs is also updated to
1.9 since another bug was fixed in that version which prevented from
building when the Qbs sources were located in the root of a drive.
Change-Id: I9d333dd0e0bf1fafc72cff093c90f8d0111162b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I5320b7c62d6a80089df75c2caca79c15602c01e5
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In some versions of Windows with a certain set of patches installed,
the Visual C++ Build Tools installer has been observed to fail during
initialization but still exit with zero status causing a silent failure.
This patch ensures that it won't be possible to build a Docker image
where the build tools didn't actually get installed.
Change-Id: Ibc90b476dae901651002a3619f7c1dbec38bc51b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
*We actually only update to 10.0.14393.1480 and not
10.0.14393.1593 because at the time of writing, .1593 causes the
installation of Visual C++ Build Tools to silently fail.
Safeguards against this failure will be provided in a subsequent
patch.
Change-Id: I3b643592a5948daafc00f84489e54211679666cc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
| |
Change-Id: Id88521a86c057ad09355dff11ff69a1aba000a17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch includes a Dockerfile that can be used to create a
Docker machine image suitable for Qbs development and for creating
Qbs release packages.
The image produced by this Dockerfile has been uploaded to Docker
Hub as qbsbuild/qbsdev:stretch. Developers can either build
the Docker image manually using `docker build` (which takes longer)
or download the prebuilt image from Docker Hub using `docker pull`.
Change-Id: I058c1c91a4a1bd075604d476467fd4de4be00807
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ie09780e1674663013aef09ec7ab98095538f0f59
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
This patch includes a Dockerfile that can be used to create a
Docker machine image suitable for Qbs development and for creating
Qbs release packages.
The image produced by this Dockerfile has been uploaded to Docker
hub as qtproject/qbswindowsservercore. Developers can either build
the Docker image manually using `docker build` (which takes longer)
or download the prebuilt image from Docker Hub using `docker pull`.
These instructions are also present in the README, along with
examples for using Docker in conjunction with the releasing script
added in the previous patch in order to create Windows release
packages.
Change-Id: I4faa969f42dbc57cca929b674c8ca8695767fee3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|