From 3c5228c54e0ad3bffd7daca61fcdd76736540670 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Tue, 15 Aug 2023 20:33:41 -0400 Subject: [PATCH] Update version numbers --- dist/linux/com.interversehq.qView.appdata.xml | 2 + dist/linux/debian/changelog | 4 +- dist/linux/rpm/qview.spec | 2 +- dist/mac/Info_legacy.plist | 62 ------------------- dist/win/qView32.iss | 2 +- dist/win/qView64.iss | 2 +- qView.pro | 9 ++- src/qvapplication.cpp | 2 +- 8 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 dist/mac/Info_legacy.plist diff --git a/dist/linux/com.interversehq.qView.appdata.xml b/dist/linux/com.interversehq.qView.appdata.xml index e02b310d..8d18f359 100644 --- a/dist/linux/com.interversehq.qView.appdata.xml +++ b/dist/linux/com.interversehq.qView.appdata.xml @@ -28,6 +28,8 @@ + + diff --git a/dist/linux/debian/changelog b/dist/linux/debian/changelog index cc9c4926..7f4e0954 100644 --- a/dist/linux/debian/changelog +++ b/dist/linux/debian/changelog @@ -1,5 +1,5 @@ -qview (6.0-1) bionic; urgency=low +qview (6.1-1) bionic; urgency=low * Initial release - -- jurplel Mon, 7 Aug 2023 14:54:07 -0400 + -- jurplel Tue, 15 Aug 2023 20:26:07 -0400 diff --git a/dist/linux/rpm/qview.spec b/dist/linux/rpm/qview.spec index 7a09ca13..8d21eb05 100644 --- a/dist/linux/rpm/qview.spec +++ b/dist/linux/rpm/qview.spec @@ -1,5 +1,5 @@ Name: qview -Version: 6.0 +Version: 6.1 Release: 1 Summary: Practical and minimal image viewer diff --git a/dist/mac/Info_legacy.plist b/dist/mac/Info_legacy.plist deleted file mode 100644 index 13c8c885..00000000 --- a/dist/mac/Info_legacy.plist +++ /dev/null @@ -1,62 +0,0 @@ - - - - - CFBundleExecutable - @EXECUTABLE@ - CFBundleName - qView - CFBundleGetInfoString - @SHORT_VERSION@ - CFBundleIconFile - @ICON@ - CFBundleIdentifier - @BUNDLEIDENTIFIER@ - CFBundlePackageType - APPL - CFBundleSignature - @TYPEINFO@ - LSMinimumSystemVersion - 10.10 - NSPrincipalClass - NSApplication - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - bmp - cur - gif - icns - ico - jpeg - jpg - jpe - jfi - jfif - pbm - pgm - png - ppm - svg - svgz - tif - tiff - wbmp - webp - xbm - xpm - - CFBundleTypeRole - Viewer - - - NSSupportsAutomaticGraphicsSwitching - - NSHighResolutionCapable - - - diff --git a/dist/win/qView32.iss b/dist/win/qView32.iss index 44ba34cc..5de11d42 100755 --- a/dist/win/qView32.iss +++ b/dist/win/qView32.iss @@ -4,7 +4,7 @@ #define MyAppExeName "qView.exe" ; Update these when building -#define MyAppVersion "6.0" +#define MyAppVersion "6.1" #define MyAppYear "2023" [Setup] diff --git a/dist/win/qView64.iss b/dist/win/qView64.iss index 805fe3f7..00eb766d 100755 --- a/dist/win/qView64.iss +++ b/dist/win/qView64.iss @@ -4,7 +4,7 @@ #define MyAppExeName "qView.exe" ; Update these when building -#define MyAppVersion "6.0" +#define MyAppVersion "6.1" #define MyAppYear "2023" [Setup] diff --git a/qView.pro b/qView.pro index cb62359e..1baa40dd 100644 --- a/qView.pro +++ b/qView.pro @@ -1,5 +1,5 @@ TARGET = qView -VERSION = 6.0 +VERSION = 6.1 QT += core gui network widgets @@ -62,12 +62,11 @@ macx { } QMAKE_TARGET_BUNDLE_PREFIX = "com.interversehq" - # Special info.plist for qt 5.9 on mac - equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 10) { - QMAKE_INFO_PLIST = "dist/mac/Info_legacy.plist" + QMAKE_INFO_PLIST = "dist/mac/Info_legacy.plist" + # Older icon for qt 5 on mac + lessThan(QT_MAJOR_VERSION, 6) { ICON = "dist/mac/qView_legacy.icns" } else { - QMAKE_INFO_PLIST = "dist/mac/Info.plist" ICON = "dist/mac/qView.icns" } } diff --git a/src/qvapplication.cpp b/src/qvapplication.cpp index 57b3acd8..4c119780 100644 --- a/src/qvapplication.cpp +++ b/src/qvapplication.cpp @@ -360,7 +360,7 @@ void QVApplication::defineFilterLists() } filterString.chop(1); filterString += ")"; - + qDebug() << filterList << filterString << fileExtensionList; // Build mime type list const auto &byteArrayMimeTypes = QImageReader::supportedMimeTypes();