Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit dd8296cb authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

android: fix issues found by Volker and Nico on Qt 5.12 clang sdk

parent f4413073
Pipeline #825 skipped with stage
......@@ -3,8 +3,8 @@ FROM ubuntu:16.04
# inspired by rabits/qt which we use for the gcc toolkit
MAINTAINER Aleix Pol <aleixpol@kde.org>
ARG QT_VERSION=5.12.0
ARG QT_TAG=5.12.0
ARG QT_VERSION=5.12.1
ARG QT_TAG=v5.12.1
ARG NDK_VERSION=r18b
ARG SDK_PLATFORM=android-21
ARG SDK_BUILD_TOOLS=28.0.2
......@@ -159,7 +159,7 @@ RUN unset ANDROID_NDK_TOOLCHAIN_VERSION \
# needs to be after building qt, otherwise it breaks weirdly
ENV QMAKESPEC android-clang
COPY build-qt build-generic build-eigen build-poppler build-openssl target-from-manifest.py target-from-appdata.py skip /opt/helpers/
COPY build-qt build-generic build-eigen build-poppler build-openssl target-from-manifest.py target-from-appdata.py build-kde-dependencies build-kde-project skip /opt/helpers/
RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
USER user
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment