diff --git a/.travis/gta5view.nsi b/.travis/gta5view.nsi index 402b0f4..1e49cdb 100644 --- a/.travis/gta5view.nsi +++ b/.travis/gta5view.nsi @@ -109,6 +109,7 @@ 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" File "/opt/windev/qt64d-latest/bin/Qt5Network.dll" +File "/opt/windev/qt64d-latest/bin/Qt5Svg.dll" File "/opt/windev/qt64d-latest/bin/Qt5Widgets.dll" File "/opt/windev/qt64d-latest/bin/Qt5WinExtras.dll" SetOutPath "$INSTDIR\lang" @@ -122,10 +123,20 @@ File "../res/qtbase_de.qm" File "../res/qtbase_fr.qm" File "../res/qtbase_ru.qm" File "../res/qtbase_zh_TW.qm" +SetOutPath "$INSTDIR\audio" +File "/opt/windev/qt64d-latest/plugins/qtaudio_windows.dll" +SetOutPath "$INSTDIR\imageformats" +File "/opt/windev/qt64d-latest/plugins/imageformats/qgif.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qicns.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qico.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qjpeg.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qsvg.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qtga.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qtiff.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qwbmp.dll" +File "/opt/windev/qt64d-latest/plugins/imageformats/qwebp.dll" SetOutPath "$INSTDIR\platforms" File "/opt/windev/qt64d-latest/plugins/platforms/qwindows.dll" -SetOutPath "$INSTDIR\imageformats" -File "/opt/windev/qt64d-latest/plugins/imageformats/qjpeg.dll" SectionEnd ###################################################################### @@ -183,6 +194,7 @@ Delete "$INSTDIR\libjpeg-62.dll" Delete "$INSTDIR\Qt5Core.dll" Delete "$INSTDIR\Qt5Gui.dll" Delete "$INSTDIR\Qt5Network.dll" +Delete "$INSTDIR\Qt5Svg.dll" Delete "$INSTDIR\Qt5Widgets.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\lang\gta5sync_en_US.qm" @@ -195,8 +207,17 @@ Delete "$INSTDIR\lang\qtbase_de.qm" Delete "$INSTDIR\lang\qtbase_fr.qm" Delete "$INSTDIR\lang\qtbase_ru.qm" Delete "$INSTDIR\lang\qtbase_zh_TW.qm" -Delete "$INSTDIR\platforms\qwindows.dll" +Delete "$INSTDIR\audio\qtaudio_windows.dll" +Delete "$INSTDIR\imageformats\qgif.dll" +Delete "$INSTDIR\imageformats\qicns.dll" +Delete "$INSTDIR\imageformats\qico.dll" Delete "$INSTDIR\imageformats\qjpeg.dll" +Delete "$INSTDIR\imageformats\qsvg.dll" +Delete "$INSTDIR\imageformats\qtga.dll" +Delete "$INSTDIR\imageformats\qtiff.dll" +Delete "$INSTDIR\imageformats\qwbmp.dll" +Delete "$INSTDIR\imageformats\qwebp.dll" +Delete "$INSTDIR\platforms\qwindows.dll" RmDir "$INSTDIR\lang" RmDir "$INSTDIR\platforms" diff --git a/PictureDialog.cpp b/PictureDialog.cpp index df89a44..0ba79e9 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -604,7 +604,11 @@ void PictureDialog::renderOverlayPicture() void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, bool readOk, bool _indexed, int _index) { - if (smpic != nullptr) smpic->disconnect(); + if (smpic != nullptr) + { + QObject::disconnect(smpic, SIGNAL(updated()), this, SLOT(updated())); + QObject::disconnect(smpic, SIGNAL(customSignal(QString)), this, SLOT(customSignal(QString))); + } snapmaticPicture = QImage(); indexed = _indexed; index = _index; diff --git a/config.h b/config.h index cba07ee..d9bc786 100644 --- a/config.h +++ b/config.h @@ -49,7 +49,7 @@ #endif #ifndef GTA5SYNC_APPVER -#define GTA5SYNC_APPVER "1.5.0" +#define GTA5SYNC_APPVER "1.5.1" #endif #ifdef GTA5SYNC_BUILDTYPE_REL diff --git a/res/app.rc b/res/app.rc index 80cdaec..a5ce270 100644 --- a/res/app.rc +++ b/res/app.rc @@ -7,8 +7,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 5, 0, 0 -PRODUCTVERSION 1, 5, 0, 0 +FILEVERSION 1, 5, 1, 0 +PRODUCTVERSION 1, 5, 1, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view" - VALUE "FileVersion", "1.5.0" + VALUE "FileVersion", "1.5.1" VALUE "InternalName", "gta5view" VALUE "LegalCopyright", "Copyright © 2016-2018 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" - VALUE "ProductVersion", "1.5.0" + VALUE "ProductVersion", "1.5.1" END END END