diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2021-01-08 12:53:27 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2021-01-10 15:16:52 -0800 |
| commit | b40354c7f28676d011de35e49b178d9aa789bbc7 (patch) | |
| tree | fcf3569df1740c9511dda5f0fb14559a80083be5 /scripts/docker | |
| parent | eb2b0f0a3eb9cf84970c9a21dda9553112b99b17 (diff) | |
| download | subsurface-b40354c7f28676d011de35e49b178d9aa789bbc7.tar.gz | |
build-system: compile stats code on mobile OSs
Android and iOS use qmake, so add the code to the .pro file.
This also removes all remnants of QCharts includes and uses and all the
references to QCharts in our various build systems.
That was a brief but extremely useful detour.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker')
| -rw-r--r-- | scripts/docker/mxe-build-container/settings.mk | 1 | ||||
| -rw-r--r-- | scripts/docker/trusty-qt512/Dockerfile | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/docker/mxe-build-container/settings.mk b/scripts/docker/mxe-build-container/settings.mk index dfd391b1d..e3f0746af 100644 --- a/scripts/docker/mxe-build-container/settings.mk +++ b/scripts/docker/mxe-build-container/settings.mk @@ -35,7 +35,6 @@ LOCAL_PKG_LIST := gcc \ qtmultimedia \ qtquickcontrols \ qtquickcontrols2 \ - qtcharts \ qtsvg \ qttools \ qttranslations \ diff --git a/scripts/docker/trusty-qt512/Dockerfile b/scripts/docker/trusty-qt512/Dockerfile index 44000dd9a..62ead14f7 100644 --- a/scripts/docker/trusty-qt512/Dockerfile +++ b/scripts/docker/trusty-qt512/Dockerfile @@ -45,7 +45,7 @@ RUN apt-get update && sudo apt-get install -y python3.6 RUN curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py" && python3.6 get-pip.py RUN pip3 install aqtinstall RUN find /usr /home -name aqt -ls -RUN /usr/local/bin/aqt install -O /usr/local/Qt 5.12.10 linux desktop -m qtcharts +RUN /usr/local/bin/aqt install -O /usr/local/Qt 5.12.10 linux desktop RUN rm -rf /usr/local/Qt/Tools /usr/local/Qt/Docs /usr/local/Qt/Examples /usr/local/Qt/Maintenance* \ /usr/local/Qt/5.12.10/gcc_64/bin/qgltf /usr/local/Qt/5.12.10/gcc_64/bin/qdoc ENV QT_ROOT /usr/local/Qt/5.12.10/gcc_64 |