From e0eb59dee8a2d1b707b9604dce641bb293c0626a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= Date: Tue, 19 Dec 2023 10:27:51 +0100 Subject: [PATCH] Use Qt 6.5.3 to build plug-in on Windows --- README.md | 2 +- appveyor.yml | 18 +++++++++--------- qtbuild_6.2.4-ro/.qmake.conf | 2 -- qtbuild_6.2.4/.qmake.conf | 2 -- qtbuild_6.5.3-ro/.qmake.conf | 0 ...age-plugin_local_alternative-libavif-ro.pro | 10 +++++----- qtbuild_6.5.3/.qmake.conf | 0 ...-image-plugin_local_alternative-libavif.pro | 10 +++++----- 8 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 qtbuild_6.2.4-ro/.qmake.conf delete mode 100644 qtbuild_6.2.4/.qmake.conf create mode 100644 qtbuild_6.5.3-ro/.qmake.conf rename {qtbuild_6.2.4-ro => qtbuild_6.5.3-ro}/qt-avif-image-plugin_local_alternative-libavif-ro.pro (78%) create mode 100644 qtbuild_6.5.3/.qmake.conf rename {qtbuild_6.2.4 => qtbuild_6.5.3}/qt-avif-image-plugin_local_alternative-libavif.pro (82%) diff --git a/README.md b/README.md index 9cd71332..c2fcff09 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ AV1 compression provides significantly better efficiency than traditional JPEG. Download [Latest Release](https://github.com/novomesk/qt-avif-image-plugin/releases/latest) and extract the content of the zip file: -`unzip qt-avif-image-plugin-0.7.0.zip` +`unzip qt-avif-image-plugin-0.7.1.zip` **Recommended**: read [README.txt](README.txt) diff --git a/appveyor.yml b/appveyor.yml index 38266833..905cf61d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.7.0.{build} +version: 0.7.1.{build} configuration: Release platform: x64 install: @@ -98,20 +98,20 @@ build_script: nmake.exe - cd ..\qtbuild_6.2.4 + cd ..\qtbuild_6.5.3 - C:\Qt\6.2.4\msvc2019_64\bin\qmake.exe qt-avif-image-plugin_local_alternative-libavif.pro + C:\Qt\6.5.3\msvc2019_64\bin\qmake.exe qt-avif-image-plugin_local_alternative-libavif.pro nmake.exe - cd ..\qtbuild_6.2.4-ro + cd ..\qtbuild_6.5.3-ro - C:\Qt\6.2.4\msvc2019_64\bin\qmake.exe qt-avif-image-plugin_local_alternative-libavif-ro.pro + C:\Qt\6.5.3\msvc2019_64\bin\qmake.exe qt-avif-image-plugin_local_alternative-libavif-ro.pro nmake.exe artifacts: -- path: plugins\imageformats\qavif.dll -- path: qtbuild_5.15.2-ro\plugins\imageformats\qavif.dll -- path: qtbuild_6.2.4\plugins\imageformats\qavif.dll -- path: qtbuild_6.2.4-ro\plugins\imageformats\qavif.dll +- path: plugins\imageformats\*.dll +- path: qtbuild_5.15.2-ro\plugins\imageformats\*.dll +- path: qtbuild_6.5.3\*.dll +- path: qtbuild_6.5.3-ro\*.dll diff --git a/qtbuild_6.2.4-ro/.qmake.conf b/qtbuild_6.2.4-ro/.qmake.conf deleted file mode 100644 index 4c3965fb..00000000 --- a/qtbuild_6.2.4-ro/.qmake.conf +++ /dev/null @@ -1,2 +0,0 @@ -load(qt_build_config) - diff --git a/qtbuild_6.2.4/.qmake.conf b/qtbuild_6.2.4/.qmake.conf deleted file mode 100644 index 4c3965fb..00000000 --- a/qtbuild_6.2.4/.qmake.conf +++ /dev/null @@ -1,2 +0,0 @@ -load(qt_build_config) - diff --git a/qtbuild_6.5.3-ro/.qmake.conf b/qtbuild_6.5.3-ro/.qmake.conf new file mode 100644 index 00000000..e69de29b diff --git a/qtbuild_6.2.4-ro/qt-avif-image-plugin_local_alternative-libavif-ro.pro b/qtbuild_6.5.3-ro/qt-avif-image-plugin_local_alternative-libavif-ro.pro similarity index 78% rename from qtbuild_6.2.4-ro/qt-avif-image-plugin_local_alternative-libavif-ro.pro rename to qtbuild_6.5.3-ro/qt-avif-image-plugin_local_alternative-libavif-ro.pro index 56eb7c2c..dc3a63f8 100644 --- a/qtbuild_6.2.4-ro/qt-avif-image-plugin_local_alternative-libavif-ro.pro +++ b/qtbuild_6.5.3-ro/qt-avif-image-plugin_local_alternative-libavif-ro.pro @@ -1,4 +1,4 @@ -TARGET = qavif +TARGET = qavif6 HEADERS = ../src/qavifhandler_p.h ../src/util_p.h SOURCES = ../src/qavifhandler.cpp @@ -11,14 +11,14 @@ unix:LIBS += -ldl INCLUDEPATH += ../ext/libavif/include -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QAVIFPlugin -load(qt_plugin) +TEMPLATE = lib -CONFIG += release skip_target_version_ext c++14 warn_on +CONFIG += release skip_target_version_ext c++14 warn_on plugin CONFIG -= separate_debug_info debug debug_and_release force_debug_info +win32:VERSION = 0.7.1 QMAKE_TARGET_COMPANY = "Daniel Novomesky" QMAKE_TARGET_PRODUCT = "qt-avif-image-plugin" QMAKE_TARGET_DESCRIPTION = "Qt plug-in to allow Qt and KDE based applications to read/write AVIF images." QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2020-2023 Daniel Novomesky" +QMAKE_TARGET_COMMENTS = "Build using Qt 6.5.3, read-only AVIF support" diff --git a/qtbuild_6.5.3/.qmake.conf b/qtbuild_6.5.3/.qmake.conf new file mode 100644 index 00000000..e69de29b diff --git a/qtbuild_6.2.4/qt-avif-image-plugin_local_alternative-libavif.pro b/qtbuild_6.5.3/qt-avif-image-plugin_local_alternative-libavif.pro similarity index 82% rename from qtbuild_6.2.4/qt-avif-image-plugin_local_alternative-libavif.pro rename to qtbuild_6.5.3/qt-avif-image-plugin_local_alternative-libavif.pro index b64fcaae..58a18d92 100644 --- a/qtbuild_6.2.4/qt-avif-image-plugin_local_alternative-libavif.pro +++ b/qtbuild_6.5.3/qt-avif-image-plugin_local_alternative-libavif.pro @@ -1,4 +1,4 @@ -TARGET = qavif +TARGET = qavif6 HEADERS = ../src/qavifhandler_p.h ../src/util_p.h SOURCES = ../src/qavifhandler.cpp @@ -11,14 +11,14 @@ unix:LIBS += -ldl INCLUDEPATH += ../ext/libavif/include -PLUGIN_TYPE = imageformats -PLUGIN_CLASS_NAME = QAVIFPlugin -load(qt_plugin) +TEMPLATE = lib -CONFIG += release skip_target_version_ext c++14 warn_on +CONFIG += release skip_target_version_ext c++14 warn_on plugin CONFIG -= separate_debug_info debug debug_and_release force_debug_info +win32:VERSION = 0.7.1 QMAKE_TARGET_COMPANY = "Daniel Novomesky" QMAKE_TARGET_PRODUCT = "qt-avif-image-plugin" QMAKE_TARGET_DESCRIPTION = "Qt plug-in to allow Qt and KDE based applications to read/write AVIF images." QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2020-2023 Daniel Novomesky" +QMAKE_TARGET_COMMENTS = "Build using Qt 6.5.3"