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 /packaging | |
| 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 'packaging')
| -rw-r--r-- | packaging/OBS/subsurfacedaily.spec | 2 | ||||
| -rwxr-xr-x | packaging/android/android-build-setup.sh | 2 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/control | 2 | ||||
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec index c2e7b2ae8..f54a363a7 100644 --- a/packaging/OBS/subsurfacedaily.spec +++ b/packaging/OBS/subsurfacedaily.spec @@ -57,7 +57,6 @@ BuildRequires: qt5-qtbase-odbc BuildRequires: qt5-qtbase-tds BuildRequires: qt5-qtconnectivity-devel BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtcharts-devel BuildRequires: libappstream-glib %else BuildRequires: update-desktop-files @@ -77,7 +76,6 @@ BuildRequires: libqt5-qtdeclarative-devel BuildRequires: libqt5-qtconnectivity-devel BuildRequires: libqt5-qtlocation-devel BuildRequires: libqt5-qtlocation-private-headers-devel -BuildRequires: libQt5Charts5-devel %endif # Recommends Qt5 translations package %if 0%{?suse_version} diff --git a/packaging/android/android-build-setup.sh b/packaging/android/android-build-setup.sh index 572eda22d..2df1c7b41 100755 --- a/packaging/android/android-build-setup.sh +++ b/packaging/android/android-build-setup.sh @@ -52,7 +52,7 @@ yes | sdkmanager --sdk_root=/android --licenses # next check that Qt is installed if [ ! -d "$LATEST_QT" ] ; then pip3 install aqtinstall - $HOME/.local/bin/aqt install -O /android "$LATEST_QT" linux android -m qtcharts + $HOME/.local/bin/aqt install -O /android "$LATEST_QT" linux android fi # now that we have an NDK, copy the font that we need for OnePlus phones diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control index b0cd49c40..60b36e62e 100644 --- a/packaging/ubuntu/debian/control +++ b/packaging/ubuntu/debian/control @@ -39,8 +39,6 @@ Build-Depends: asciidoc, qml-module-qtquick2, libcurl4-openssl-dev, qtconnectivity5-dev, - libqt5charts5-dev, - qml-module-qtcharts, subsurface-qt-private-headers Standards-Version: 3.9.7 Homepage: http://subsurface-divelog.org diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 99d6a7052..7f4c809b2 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -260,7 +260,6 @@ done # next we need the QML modules QT_QML_MODULES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtQuick.2 \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtLocation \ -$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtCharts \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtPositioning" mkdir -p $STAGING_DIR/qml |