From 827676768a8a13cd6998e4537a45d18841d83ebb Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Mon, 22 Apr 2019 04:59:26 +0200
Subject: [PATCH] update Qt to 5.12.3
---
.ci/gta5view.nsi | 8 ++++----
.ci/windows_build.sh | 6 ++++++
.ci/windows_docker.sh | 2 +-
.ci/wininstall_docker.sh | 2 +-
.gitlab-ci.yml | 4 ++--
PictureDialog.cpp | 6 +++---
PictureDialog.h | 2 +-
SnapmaticWidget.cpp | 2 +-
8 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/.ci/gta5view.nsi b/.ci/gta5view.nsi
index 24c949d..93b2cb0 100644
--- a/.ci/gta5view.nsi
+++ b/.ci/gta5view.nsi
@@ -102,10 +102,10 @@ ${INSTALL_TYPE}
SetOverwrite ifnewer
SetOutPath "$INSTDIR"
File "../build/release/gta5view.exe"
-File "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libgcc_s_seh-1.dll"
-File "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libstdc++-6.dll"
-File "/opt/windev/libressl-latest_qt64d/bin/libcrypto-43.dll"
-File "/opt/windev/libressl-latest_qt64d/bin/libssl-45.dll"
+File "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libgcc_s_seh-1.dll"
+File "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libstdc++-6.dll"
+File "/opt/windev/openssl-latest_qt64d/bin/libcrypto-1_1-x64.dll"
+File "/opt/windev/openssl-latest_qt64d/bin/libssl-1_1-x64.dll"
File "/opt/windev/libjpeg-turbo-latest_qt64d/bin/libjpeg-62.dll"
File "/opt/windev/qt64d-latest/bin/Qt5Core.dll"
File "/opt/windev/qt64d-latest/bin/Qt5Gui.dll"
diff --git a/.ci/windows_build.sh b/.ci/windows_build.sh
index 2fb53ce..ad87519 100755
--- a/.ci/windows_build.sh
+++ b/.ci/windows_build.sh
@@ -1,5 +1,11 @@
#!/bin/bash
+# Prepare OpenSSL
+rm -rf /opt/windev/openssl-latest_qt64s/lib/libcrypto.dll.a && \
+rm -rf /opt/windev/openssl-latest_qt64s/lib/libssl.dll.a && \
+cp -Rf /opt/windev/openssl-latest_qt64s/lib/libcrypto.a /opt/windev/openssl-latest_qt64s/lib/libcrypto.dll.a && \
+cp -Rf /opt/windev/openssl-latest_qt64s/lib/libssl.a /opt/windev/openssl-latest_qt64s/lib/libssl.dll.a && \
+
# Prepare environment variable
export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \
diff --git a/.ci/windows_docker.sh b/.ci/windows_docker.sh
index 701aa18..2d840a0 100755
--- a/.ci/windows_docker.sh
+++ b/.ci/windows_docker.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-DOCKER_IMAGE=sypingauto/gta5view-build:static
+DOCKER_IMAGE=sypingauto/gta5view-build:1.7-static
PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \
diff --git a/.ci/wininstall_docker.sh b/.ci/wininstall_docker.sh
index 7d55975..3b12444 100755
--- a/.ci/wininstall_docker.sh
+++ b/.ci/wininstall_docker.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-DOCKER_IMAGE=sypingauto/gta5view-build:shared
+DOCKER_IMAGE=sypingauto/gta5view-build:1.7-shared
PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4edd87..0fdf0cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
Windows Installer:
stage: build
- image: sypingauto/gta5view-build:shared
+ image: sypingauto/gta5view-build:1.7-shared
variables:
BUILD_SCRIPT: "wininstall_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32"
@@ -19,7 +19,7 @@ Windows Installer:
Windows Portable:
stage: build
- image: sypingauto/gta5view-build:static
+ image: sypingauto/gta5view-build:1.7-static
variables:
BUILD_SCRIPT: "windows_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32"
diff --git a/PictureDialog.cpp b/PictureDialog.cpp
index 4910a68..72e4313 100644
--- a/PictureDialog.cpp
+++ b/PictureDialog.cpp
@@ -379,14 +379,14 @@ void PictureDialog::adaptNewDialogSize(QSize newLabelSize)
updateGeometry();
}
-void PictureDialog::stylizeDialog()
+void PictureDialog::styliseDialog()
{
#ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050200
if (QtWin::isCompositionEnabled())
{
QPalette palette;
- QtWin::extendFrameIntoClientArea(this, 0, (layout()->menuBar()->height() * AppEnv::screenRatioPR()), 0, 0);
+ QtWin::extendFrameIntoClientArea(this, 0, qRound(layout()->menuBar()->height() * AppEnv::screenRatioPR()), 0, 0);
ui->jsonFrame->setStyleSheet(QString("QFrame { background: %1; }").arg(palette.window().color().name()));
setStyleSheet("PictureDialog { background: transparent; }");
}
@@ -409,7 +409,7 @@ bool PictureDialog::event(QEvent *event)
{
if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange)
{
- stylizeDialog();
+ styliseDialog();
}
}
#endif
diff --git a/PictureDialog.h b/PictureDialog.h
index ef351b8..b0be786 100644
--- a/PictureDialog.h
+++ b/PictureDialog.h
@@ -56,7 +56,7 @@ public:
void setSnapmaticPicture(SnapmaticPicture *picture, int index);
void setSnapmaticPicture(SnapmaticPicture *picture);
void addPreviousNextButtons();
- void stylizeDialog();
+ void styliseDialog();
bool isIndexed();
int getIndex();
~PictureDialog();
diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp
index 0ef52cd..72099b6 100644
--- a/SnapmaticWidget.cpp
+++ b/SnapmaticWidget.cpp
@@ -142,7 +142,7 @@ void SnapmaticWidget::on_cmdView_clicked()
picDialog->showMaximized();
#else
picDialog->show();
- if (navigationBar) picDialog->stylizeDialog();
+ if (navigationBar) picDialog->styliseDialog();
//picDialog->adaptNewDialogSize();
picDialog->setMinimumSize(picDialog->size());
picDialog->setMaximumSize(picDialog->size());