From 3bfe7344c3c8ed642f6b2c5c602facdd033ffb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophanee=20Mayaud?= Date: Sun, 31 Dec 2023 11:41:45 +0100 Subject: [PATCH] chore(qt): update qt to 6.5.3 because of macos 14 sonoma qmake bug QTBUG-117225 --- QtProject/release-build/macos/package.json | 4 +- .../video-simili-duplicate-cleaner.pro.user | 42 +++++++++---------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/QtProject/release-build/macos/package.json b/QtProject/release-build/macos/package.json index db0ad4a..03eca08 100644 --- a/QtProject/release-build/macos/package.json +++ b/QtProject/release-build/macos/package.json @@ -1,8 +1,8 @@ { "scripts": { - "qmake": "/Users/theophane/Qt/6.5.2/macos/bin/qmake '../../app/app.pro' -spec macx-clang QMAKE_APPLE_DEVICE_ARCHS='x86_64 arm64' CONFIG+=qtquickcompiler && make qmake_all", + "qmake": "/Users/theophane/Qt/6.5.3/macos/bin/qmake '../../app/app.pro' -spec macx-clang QMAKE_APPLE_DEVICE_ARCHS='x86_64 arm64' CONFIG+=qtquickcompiler && make qmake_all", "make": "make -j8", - "macdeploy": "/Users/theophane/Qt/6.5.2/macos/bin/macdeployqt 'Video simili duplicate cleaner.app' -dmg -always-overwrite -appstore-compliant", + "macdeploy": "/Users/theophane/Qt/6.5.3/macos/bin/macdeployqt 'Video simili duplicate cleaner.app' -dmg -always-overwrite -appstore-compliant", "build-mac-binaries": "npm run build-mac && npm run sign-and-package", "build-mac": "npm run qmake && npm run make && npm run macdeploy", "sign-and-package": "cp Info.plist 'Video simili duplicate cleaner.app/Contents/Info.plist' && npm run sign-app && npm run package-app", diff --git a/QtProject/video-simili-duplicate-cleaner.pro.user b/QtProject/video-simili-duplicate-cleaner.pro.user index a0b3787..bdc24f8 100644 --- a/QtProject/video-simili-duplicate-cleaner.pro.user +++ b/QtProject/video-simili-duplicate-cleaner.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -37,6 +37,7 @@ true true 1 + 0 false true false @@ -68,25 +69,7 @@ true true - - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - PartiallyChecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - Unchecked - + 0 true @@ -100,14 +83,17 @@ true + + true + ProjectExplorer.Project.Target.0 Desktop - Qt 6.5.2 for macOS - Qt 6.5.2 for macOS + Qt 6.5.3 upgrade de Qt 6.5.2 + Qt 6.5.3 upgrade de Qt 6.5.2 qt.qt6.652.clang_64_kit 0 0 @@ -209,13 +195,16 @@ true true + 0 true 2 false + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/app/app.pro /Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/app/app.pro + false true true true @@ -224,13 +213,16 @@ true true + 0 true 2 false + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_comparison/test_comparison.pro /Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_comparison/test_comparison.pro + false true true true @@ -239,13 +231,16 @@ true true + 0 true 2 false + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_mainwindow/test_mainwindow.pro /Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_mainwindow/test_mainwindow.pro + false true true true @@ -254,13 +249,16 @@ true true + 0 true 2 false + Qt4ProjectManager.Qt4RunConfiguration:/Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_video/test_video.pro /Users/theophane/Dev/video-simili-duplicate-cleaner/QtProject/tests/test_video/test_video.pro + false true true true