diff options
| -rw-r--r-- | Dockerfile.android | 1 | ||||
| -rw-r--r-- | Dockerfile.linux | 14 | ||||
| -rw-r--r-- | Dockerfile.windows | 13 |
3 files changed, 5 insertions, 23 deletions
diff --git a/Dockerfile.android b/Dockerfile.android index daa0acc9..c99a8d4a 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -58,6 +58,7 @@ RUN wget -q https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zl RUN git clone https://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 \ && cd qt5 \ + && git reset --hard dc2ac680fa9d0ef7b0d9520859593d13951bedea \ && perl init-repository --module-subset=default,-qtwebengine \ && PATH=${HOST_PATH} ./configure -v -developer-build -release \ -xplatform android-clang \ diff --git a/Dockerfile.linux b/Dockerfile.linux index 1e08748b..588a5a3e 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -190,18 +190,8 @@ RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \ rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \ git clone https://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \ cd qt5 && \ - git clone https://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \ + git reset --hard dc2ac680fa9d0ef7b0d9520859593d13951bedea && \ + git submodule update --init --depth 1 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtmultimedia qtquickcontrols qtquickcontrols2 qtsvg qttools qttranslations qtx11extras qtxmlpatterns && \ sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \ sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \ sed -ri s/\(Libs:.*\)/\\1\ -lXau/ /usr/local/lib/pkgconfig/xcb.pc && \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 2c760c68..1e218958 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -23,17 +23,8 @@ RUN make -j$THREADS -C /depends HOST=x86_64-w64-mingw32 NO_QT=1 RUN git clone https://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \ cd qt5 && \ - git clone https://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \ - git clone https://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \ + git reset --hard dc2ac680fa9d0ef7b0d9520859593d13951bedea && \ + git submodule update --init --depth 1 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtmultimedia qtquickcontrols qtquickcontrols2 qtsvg qttools qttranslations qtxmlpatterns && \ ./configure --prefix=/depends/x86_64-w64-mingw32 -xplatform win32-g++ \ -device-option CROSS_COMPILE=/usr/bin/x86_64-w64-mingw32- \ -I $(pwd)/qtbase/src/3rdparty/angle/include \ |