From f403a5947542d14f3f01bbb149ff15fc1548358e Mon Sep 17 00:00:00 2001 From: woblight Date: Mon, 16 Jul 2018 16:47:16 +0200 Subject: [PATCH] Fix debian qmake 2 --- .gitlab-ci.yml | 2 +- CI.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a651d3a..d2ea715 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - apt-get update -qq && apt-get install -y -qq wine qtbase5-dev qtquickcontrols2-5-dev libgit2-dev qtbase5-dev libqt5concurrent5 g++-mingw-w64-i686 gcc-mingw-w64-i686 make + - apt-get update -qq && apt-get install -y -qq wine qt5-qmake qt5-default qtbase5-dev qtquickcontrols2-5-dev libgit2-dev qtbase5-dev libqt5concurrent5 g++-mingw-w64-i686 gcc-mingw-w64-i686 make cache: paths: diff --git a/CI.mk b/CI.mk index 069da4f..daad1f9 100644 --- a/CI.mk +++ b/CI.mk @@ -9,7 +9,7 @@ WINEPATH:=WINEPATH='C:\Program Files (x86)\CMake\bin;$(shell $(winepath) -w "$(p qmake_opts=QTDIR="Z:/$(pwd)/Qt/5.11.1/mingw53_32/bin/" "QMAKE_INCDIR+=Z:/$(pwd)/libgit2-0.27.2/include" "QMAKE_LIBDIR+=Z:/$(pwd)/libgit2-0.27.2/build/" build: - qt5-qmake . -o build/Makefile + qmake . -o build/Makefile make -C build cmake-3.12.0-rc3-win32-x86.msi: