Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

update Qt to 5.12.3

Browse source
This commit is contained in:
Syping 2019-04-22 04:59:26 +02:00
parent 0c02c3ce98
commit 827676768a
8 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci/gta5view.nsi
View file

@ -102,10 +102,10 @@ ${INSTALL_TYPE}
SetOverwrite ifnewer SetOverwrite ifnewer
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "../build/release/gta5view.exe" 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/8.3-win32/libgcc_s_seh-1.dll"
File "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libstdc++-6.dll" File "/usr/lib/gcc/x86_64-w64-mingw32/8.3-win32/libstdc++-6.dll"
File "/opt/windev/libressl-latest_qt64d/bin/libcrypto-43.dll" File "/opt/windev/openssl-latest_qt64d/bin/libcrypto-1_1-x64.dll"
File "/opt/windev/libressl-latest_qt64d/bin/libssl-45.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/libjpeg-turbo-latest_qt64d/bin/libjpeg-62.dll"
File "/opt/windev/qt64d-latest/bin/Qt5Core.dll" File "/opt/windev/qt64d-latest/bin/Qt5Core.dll"
File "/opt/windev/qt64d-latest/bin/Qt5Gui.dll" File "/opt/windev/qt64d-latest/bin/Qt5Gui.dll"

6
.ci/windows_build.sh
View file

@ -1,5 +1,11 @@
#!/bin/bash #!/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 # Prepare environment variable
export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \ export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \

2
.ci/windows_docker.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
DOCKER_IMAGE=sypingauto/gta5view-build:static DOCKER_IMAGE=sypingauto/gta5view-build:1.7-static
PROJECT_DIR_DOCKER=/gta5view PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \ cd ${PROJECT_DIR} && \

2
.ci/wininstall_docker.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
DOCKER_IMAGE=sypingauto/gta5view-build:shared DOCKER_IMAGE=sypingauto/gta5view-build:1.7-shared
PROJECT_DIR_DOCKER=/gta5view PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \ cd ${PROJECT_DIR} && \

4
.gitlab-ci.yml
View file

@ -6,7 +6,7 @@ variables:
Windows Installer: Windows Installer:
stage: build stage: build
image: sypingauto/gta5view-build:shared image: sypingauto/gta5view-build:1.7-shared
variables: variables:
BUILD_SCRIPT: "wininstall_build.sh" BUILD_SCRIPT: "wininstall_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
@ -19,7 +19,7 @@ Windows Installer:
Windows Portable: Windows Portable:
stage: build stage: build
image: sypingauto/gta5view-build:static image: sypingauto/gta5view-build:1.7-static
variables: variables:
BUILD_SCRIPT: "windows_build.sh" BUILD_SCRIPT: "windows_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"

6
PictureDialog.cpp
View file

@ -379,14 +379,14 @@ void PictureDialog::adaptNewDialogSize(QSize newLabelSize)
updateGeometry(); updateGeometry();
} }
void PictureDialog::stylizeDialog() void PictureDialog::styliseDialog()
{ {
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050200 #if QT_VERSION >= 0x050200
if (QtWin::isCompositionEnabled()) if (QtWin::isCompositionEnabled())
{ {
QPalette palette; 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())); ui->jsonFrame->setStyleSheet(QString("QFrame { background: %1; }").arg(palette.window().color().name()));
setStyleSheet("PictureDialog { background: transparent; }"); setStyleSheet("PictureDialog { background: transparent; }");
} }
@ -409,7 +409,7 @@ bool PictureDialog::event(QEvent *event)
{ {
if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange) if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange)
{ {
stylizeDialog(); styliseDialog();
} }
} }
#endif #endif

2
PictureDialog.h
View file

@ -56,7 +56,7 @@ public:
void setSnapmaticPicture(SnapmaticPicture *picture, int index); void setSnapmaticPicture(SnapmaticPicture *picture, int index);
void setSnapmaticPicture(SnapmaticPicture *picture); void setSnapmaticPicture(SnapmaticPicture *picture);
void addPreviousNextButtons(); void addPreviousNextButtons();
void stylizeDialog(); void styliseDialog();
bool isIndexed(); bool isIndexed();
int getIndex(); int getIndex();
~PictureDialog(); ~PictureDialog();

2
SnapmaticWidget.cpp
View file

@ -142,7 +142,7 @@ void SnapmaticWidget::on_cmdView_clicked()
picDialog->showMaximized(); picDialog->showMaximized();
#else #else
picDialog->show(); picDialog->show();
if (navigationBar) picDialog->stylizeDialog(); if (navigationBar) picDialog->styliseDialog();
//picDialog->adaptNewDialogSize(); //picDialog->adaptNewDialogSize();
picDialog->setMinimumSize(picDialog->size()); picDialog->setMinimumSize(picDialog->size());
picDialog->setMaximumSize(picDialog->size()); picDialog->setMaximumSize(picDialog->size());