Commit dcb1ec41 authored by Martin Höher's avatar Martin Höher

Merge branch '209-update-to-qt-5-11-1' into 'master'

Resolve "Update to Qt 5.11.2"

Closes #209

See merge request !102
parents 3e32d47a 0ead887a
Pipeline #42909294 failed with stages
in 10 minutes and 40 seconds
......@@ -17,7 +17,9 @@ doc/latex/
app/android/gradle.properties
app/android/local.properties
/build-*
/deploy-*
config.tests/*/Makefile
config.tests/*/*.o
config.tests/qtkeychain/qtkeychain
.qmake.stash
CMakeLists.txt.user*
variables:
WIN32_IMAGE: registry.gitlab.com/rpdev/opentodolist:win32
WIN64_IMAGE: registry.gitlab.com/rpdev/opentodolist:win64
MXE_WIN32_IMAGE: registry.gitlab.com/rpdev/opentodolist:win32
MXE_WIN64_IMAGE: registry.gitlab.com/rpdev/opentodolist:win64
UBUNTU_IMAGE: registry.gitlab.com/rpdev/opentodolist:ubuntu
ANDROID_IMAGE: registry.gitlab.com/rpdev/opentodolist:android
NEXTCLOUD_IMAGE: nextcloud
......@@ -40,28 +38,26 @@ build_image_ubuntu:
# Build the Win32 Image
build_image_win32:
stage: images
image: docker:git
services:
- docker:dind
image: fedora
script:
- dnf install -y --nogpgcheck podman buildah
- cd ci/docker/win32
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- docker build --pull -t $WIN32_IMAGE .
- docker push $WIN32_IMAGE
- podman login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- buildah bud -t $WIN32_IMAGE .
- buildah push $WIN32_IMAGE docker://$WIN32_IMAGE
when: manual
# Build the Win64 Image
build_image_win64:
stage: images
image: docker:git
services:
- docker:dind
image: fedora
script:
- dnf install -y --nogpgcheck podman buildah
- cd ci/docker/win64
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- docker build --pull -t $WIN64_IMAGE .
- docker push $WIN64_IMAGE
- podman login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- buildah bud -t $WIN64_IMAGE .
- buildah push $WIN64_IMAGE docker://$WIN64_IMAGE
when: manual
......@@ -104,7 +100,7 @@ ubuntu_appimage:
# Windows 32bit build
win32_build:
stage: build
image: $MXE_WIN32_IMAGE
image: $WIN32_IMAGE
script:
- ./ci/win32-build.sh
artifacts:
......@@ -116,7 +112,7 @@ win32_build:
# Windows 64bit build
win64_build:
stage: build
image: $MXE_WIN64_IMAGE
image: $WIN64_IMAGE
script:
- ./ci/win64-build.sh
artifacts:
......@@ -125,34 +121,6 @@ win64_build:
expire_in: 1 week
# Windows Visual Studio 32bit Build
win32_vs_build:
stage: build
tags:
- windows
script:
- .\\ci\\windows\\windows-msvc17-x32.bat
artifacts:
paths:
- build-win32-vs/OpenTodoList-Windows-32bit-MSVC.exe
expire_in: 1 week
when: manual
# Windows Visual Studio 64bit Build
win64_vs_build:
stage: build
tags:
- windows
script:
- .\\ci\\windows\\windows-msvc17-x64.bat
artifacts:
paths:
- build-win64-vs/OpenTodoList-Windows-64bit-MSVC.exe
expire_in: 1 week
when: manual
# macOS build:
macos:
stage: build
......@@ -192,7 +160,7 @@ android_x86:
################################################################################
# Installed Stage
# Installer Stage
################################################################################
sign_apks:
......
Subproject commit 6c6480bcd1062cab7f25e0b40551db18c4d7f75c
Subproject commit 21daf4cf29c4c869f46a54cb24fd57d69e04b794
......@@ -33,7 +33,7 @@ class QmlFileSystemWatcher : public QObject
public:
QmlFileSystemWatcher(const QString baseUrl, QQmlApplicationEngine *engine, QObject *parent = 0) :
QmlFileSystemWatcher(const QString baseUrl, QQmlApplicationEngine *engine, QObject *parent = nullptr) :
QObject(parent),
m_baseUrl(baseUrl),
m_engine(engine),
......
......@@ -32,6 +32,6 @@ RUN \
ENV ANDROID_SDK_ROOT /opt/android/android-sdk
ENV ANDROID_NDK /opt/android/android-ndk-r15c
ENV ANDROID_NDK_ROOT /opt/android/android-ndk-r15c
ENV QT_ARM_ROOT /opt/Qt/5.10.0/android_armv7/
ENV QT_X86_ROOT /opt/Qt/5.10.0/android_x86/
ENV QT_ARM_ROOT /opt/Qt/5.11.2/android_armv7/
ENV QT_X86_ROOT /opt/Qt/5.11.2/android_x86/
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
......@@ -5,11 +5,10 @@ help:
@echo " publish - Upload the image to GitLab."
build:
docker build --pull -t ${IMAGE} .
buildah bud --pull -t ${IMAGE} .
publish:
docker push ${IMAGE}
buildah push docker://${IMAGE}
login:
docker login registry.gitlab.com
podman login registry.gitlab.com
......@@ -27,9 +27,9 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.pageById(QInstaller.ComponentSelection);
widget.deselectAll();
widget.selectComponent("qt.qt5.5100.android_armv7");
widget.selectComponent("qt.qt5.5100.android_x86");
widget.selectComponent("qt.qt5.5100.qtremoteobjects");
widget.selectComponent("qt.qt5.5112.android_armv7");
widget.selectComponent("qt.qt5.5112.android_x86");
widget.selectComponent("qt.qt5.5112.qtremoteobjects");
gui.clickButton(buttons.NextButton);
}
......
......@@ -2,27 +2,27 @@ FROM ubuntu:xenial
RUN \
apt-get update && \
apt-get install -y software-properties-common wget curl && \
add-apt-repository --yes ppa:beineri/opt-qt-5.10.0-xenial && \
add-apt-repository --yes ppa:beineri/opt-qt-5.11.2-xenial && \
wget http://ftp.de.debian.org/debian/pool/main/p/patchelf/patchelf_0.8-2_amd64.deb && \
dpkg -i patchelf_0.8-2_amd64.deb && \
rm patchelf_0.8-2_amd64.deb && \
apt-get update && \
apt-get install -y \
qt510base \
qt510declarative \
qt510tools \
qt510svg \
qt510graphicaleffects \
qt510imageformats \
qt510translations \
qt510quickcontrols \
qt510quickcontrols2 \
qt510x11extras \
qt510websockets \
qt510webchannel \
qt510webengine \
qt510remoteobjects \
qt510wayland \
qt511base \
qt511declarative \
qt511tools \
qt511svg \
qt511graphicaleffects \
qt511imageformats \
qt511translations \
qt511quickcontrols \
qt511quickcontrols2 \
qt511x11extras \
qt511websockets \
qt511webchannel \
qt511webengine \
qt511remoteobjects \
qt511wayland \
build-essential \
libgl1-mesa-dev \
libfuse2 \
......
......@@ -5,11 +5,10 @@ help:
@echo " publish - Upload the image to GitLab."
build:
docker build --pull -t ${IMAGE} .
buildah bud --pull -t ${IMAGE} .
publish:
docker push ${IMAGE}
buildah push docker://${IMAGE}
login:
docker login registry.gitlab.com
podman login registry.gitlab.com
FROM debian
# Note: If build fails, check out this issue:
# https://github.com/mxe/mxe/issues/2011
FROM fedora:rawhide
RUN \
\
apt-get update && \
apt-get install -y \
autoconf automake autopoint bash bison bzip2 flex gettext \
git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
libtool-bin libltdl-dev libssl-dev libxml-parser-perl make \
openssl p7zip-full patch perl pkg-config python ruby scons \
sed unzip wget xz-utils nsis && \
\
cd opt && \
mkdir mxe-i686-shared && \
cd mxe-i686-shared && \
git clone https://github.com/mxe/mxe.git . && \
make MXE_TARGETS='i686-w64-mingw32.shared' \
JOBS=4 \
qt5
dnf install -y --nogpgcheck \
cmake \
ninja-build \
python3 \
python \
git \
wget \
mingw32-qt5-qmake \
mingw32-qt5-qmldevtools \
mingw32-qt5-qmldevtools-devel \
mingw32-qt5-qt3d \
mingw32-qt5-qt3d-tools \
mingw32-qt5-qtactiveqt \
mingw32-qt5-qtbase \
mingw32-qt5-qtbase-devel \
mingw32-qt5-qtcharts \
mingw32-qt5-qtdeclarative \
mingw32-qt5-qtgraphicaleffects \
mingw32-qt5-qtimageformats \
mingw32-qt5-qtlocation \
mingw32-qt5-qtmultimedia \
mingw32-qt5-qtquickcontrols \
mingw32-qt5-qtsensors \
mingw32-qt5-qtserialport \
mingw32-qt5-qtsvg \
mingw32-qt5-qttools \
mingw32-qt5-qttools-tools \
mingw32-qt5-qttranslations \
mingw32-qt5-qtwebkit \
mingw32-qt5-qtwebsockets \
mingw32-qt5-qtwinextras \
mingw32-qt5-qtxmlpatterns \
mingw32-nsis \
mingw32-nsiswrapper \
\
&& \
cd / && \
git clone https://github.com/qt/qtquickcontrols2.git && \
cd qtquickcontrols2 && \
git checkout v$(mingw32-qmake-qt5 -query QT_VERSION) && \
mingw32-qmake-qt5 && \
make -j4 && \
make install && \
cd .. && \
rm -rf qtquickcontrols2
......@@ -5,11 +5,10 @@ help:
@echo " publish - Upload the image to GitLab."
build:
docker build --pull -t ${IMAGE} .
buildah bud --pull -t ${IMAGE} .
publish:
docker push ${IMAGE}
buildah push docker://${IMAGE}
login:
docker login registry.gitlab.com
podman login registry.gitlab.com
FROM debian
FROM fedora:rawhide
RUN \
\
apt-get update && \
apt-get install -y \
autoconf automake autopoint bash bison bzip2 flex gettext \
git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
libtool-bin libltdl-dev libssl-dev libxml-parser-perl make \
openssl p7zip-full patch perl pkg-config python ruby scons \
sed unzip wget xz-utils nsis && \
\
cd opt && \
mkdir mxe-x64-shared && \
cd mxe-x64-shared && \
git clone https://github.com/mxe/mxe.git . && \
make MXE_TARGETS='x86_64-w64-mingw32.shared' \
JOBS=4 \
qt5
dnf install -y --nogpgcheck \
cmake \
ninja-build \
python3 \
python \
git \
wget \
mingw64-qt5-qmake \
mingw64-qt5-qmldevtools \
mingw64-qt5-qmldevtools-devel \
mingw64-qt5-qt3d \
mingw64-qt5-qt3d-tools \
mingw64-qt5-qtactiveqt \
mingw64-qt5-qtbase \
mingw64-qt5-qtbase-devel \
mingw64-qt5-qtcharts \
mingw64-qt5-qtdeclarative \
mingw64-qt5-qtgraphicaleffects \
mingw64-qt5-qtimageformats \
mingw64-qt5-qtlocation \
mingw64-qt5-qtmultimedia \
mingw64-qt5-qtquickcontrols \
mingw64-qt5-qtsensors \
mingw64-qt5-qtserialport \
mingw64-qt5-qtsvg \
mingw64-qt5-qttools \
mingw64-qt5-qttools-tools \
mingw64-qt5-qttranslations \
mingw64-qt5-qtwebkit \
mingw64-qt5-qtwebsockets \
mingw64-qt5-qtwinextras \
mingw64-qt5-qtxmlpatterns \
mingw32-nsis \
mingw32-nsiswrapper \
\
&& \
cd / && \
git clone https://github.com/qt/qtquickcontrols2.git && \
cd qtquickcontrols2 && \
git checkout v$(mingw64-qmake-qt5 -query QT_VERSION) && \
mingw64-qmake-qt5 && \
make -j4 && \
make install && \
cd .. && \
rm -rf qtquickcontrols2
......@@ -5,11 +5,10 @@ help:
@echo " publish - Upload the image to GitLab."
build:
docker build --pull -t ${IMAGE} .
buildah bud --pull -t ${IMAGE} .
publish:
docker push ${IMAGE}
buildah push docker://${IMAGE}
login:
docker login registry.gitlab.com
podman login registry.gitlab.com
......@@ -19,7 +19,7 @@ which cmake || (apt-get update && apt-get install -y cmake)
desktop-file-validate templates/appimage/default.desktop
source /opt/qt510/bin/qt510-env.sh || true
source /opt/qt511/bin/qt511-env.sh || true
export QT_QPA_PLATFORM=minimal
mkdir -p build-ubuntu
......
......@@ -2,36 +2,43 @@
set -e
# Note: Paths need to be corrected on next image rebuild
export PATH=/opt/mxe-x64-shared/usr/bin:$PATH
export PATH=/opt/mxe-x64-shared/usr/i686-w64-mingw32.shared/qt5/bin:$PATH
mkdir -p build-win32
cd build-win32
i686-w64-mingw32.shared-cmake \
mingw32-cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DOPENTODOLIST_WITH_UPDATE_SERVICE=ON \
-DUSE_CREDENTIAL_STORE=ON \
-DQTKEYCHAIN_STATIC=ON \
..
i686-w64-mingw32.shared-cmake --build . -- opentodolist-translations
i686-w64-mingw32.shared-cmake --build . --target all -- -j4
cmake --build . -- opentodolist-translations
cmake --build . --target all
cd ..
mkdir -p deploy-win32/bin
cp build-win32/app/OpenTodoList.exe deploy-win32/bin/
cp \
build-win32/app/OpenTodoList.exe \
build-win32/3rdparty/qlmdb/qlmdb/libqlmdb.dll \
/usr/i686-w64-mingw32/sys-root/mingw/bin/libcrypto-1_1.dll \
/usr/i686-w64-mingw32/sys-root/mingw/bin/libssl-1_1.dll \
/usr/i686-w64-mingw32/sys-root/mingw/bin/libEGL.dll \
/usr/i686-w64-mingw32/sys-root/mingw/bin/libGLESv2.dll \
\
deploy-win32/bin/
apt-get update
apt-get install -y wget python3
wget https://gitlab.com/rpdev/xwindeployqt/raw/master/xwindeployqt
chmod +x xwindeployqt
./xwindeployqt --toolchain-root /opt/mxe-x64-shared/ \
--toolchain-arch i686-w64-mingw32.shared \
--qml-dir ./app \
--plugins bearer \
./xwindeployqt \
--driver fedora-mingw \
--qml-dir app \
--plugins platforms \
--plugins imageformats \
--plugins sqldrivers \
--plugins bearer \
--mingw-arch i686-w64-mingw32 \
deploy-win32/bin/
cp templates/nsis/win32-installer.nsis deploy-win32/
......
......@@ -2,35 +2,43 @@
set -e
export PATH=/opt/mxe-x64-shared/usr/bin:$PATH
export PATH=/opt/mxe-x64-shared/usr/x86_64-w64-mingw32.shared/qt5/bin:$PATH
mkdir build-win64
mkdir -p build-win64
cd build-win64
x86_64-w64-mingw32.shared-cmake \
mingw64-cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DOPENTODOLIST_WITH_UPDATE_SERVICE=ON \
-DUSE_CREDENTIAL_STORE=ON \
-DQTKEYCHAIN_STATIC=ON \
..
x86_64-w64-mingw32.shared-cmake --build . -- opentodolist-translations
x86_64-w64-mingw32.shared-cmake --build . --target all -- -j4
cmake --build . -- opentodolist-translations
cmake --build . --target all
cd ..
mkdir -p deploy-win64/bin
cp build-win64/app/OpenTodoList.exe deploy-win64/bin/
cp \
build-win64/app/OpenTodoList.exe \
build-win64/3rdparty/qlmdb/qlmdb/libqlmdb.dll \
/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libcrypto-1_1-x64.dll \
/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssl-1_1-x64.dll \
/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libEGL.dll \
/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libGLESv2.dll \
\
deploy-win64/bin/
apt-get update
apt-get install -y wget python3
wget https://gitlab.com/rpdev/xwindeployqt/raw/master/xwindeployqt
chmod +x xwindeployqt
./xwindeployqt --toolchain-root /opt/mxe-x64-shared/ \
--toolchain-arch x86_64-w64-mingw32.shared \
--qml-dir ./app \
--plugins bearer \
./xwindeployqt \
--driver fedora-mingw \
--qml-dir app \
--plugins platforms \
--plugins imageformats \
--plugins sqldrivers \
--plugins bearer \
--mingw-arch x86_64-w64-mingw32 \
deploy-win64/bin/
cp templates/nsis/win64-installer.nsis deploy-win64/
......
......@@ -100,7 +100,7 @@ find_package(Qt5Xml REQUIRED)
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Sql REQUIRED)
if(ANDROID)
if(ANDROID OR WIN32)
set(libtype STATIC)
else()
set(libtype SHARED)
......
......@@ -53,13 +53,18 @@ void ItemsQueryRunnable::run()
m_query->finish();
}
/**
* @brief Constructor.
*/
Cache::Cache(QObject *parent) : QObject(parent),
m_cacheDirectory(),
m_cacheSize(3U * 1024U * 1024U * 1024U),
m_cacheSize(
#if QT_POINTER_SIZE == 4
1U * 1024U * 1024U * 1024U
#else
3U * 1024U * 1024U * 1024U
#endif
),
m_context(nullptr),
m_global(),
m_items(),
......
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