diff options
author | Katja Marttila <katja.marttila@qt.io> | 2023-01-13 10:01:49 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2023-01-13 10:07:05 +0200 |
commit | b72b90662e718d022dd06e7369008fe4f319e650 (patch) | |
tree | f4af2134dc7ae8627217d318e220a0a896501b28 | |
parent | 810e6461f5dd61ffbd662b1f43a3aba298640dca (diff) |
Update IFW version number and Changelog
Change-Id: Ic00bf9b6db604d4f3c0307a96229316ad1c1cd87
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | Changelog | 3 | ||||
-rw-r--r-- | coin/instructions/make_instructions.yaml | 22 | ||||
-rw-r--r-- | dist/packages/org.qtproject.ifw.binaries/meta/package.xml | 4 | ||||
-rw-r--r-- | dist/packages/org.qtproject.ifw/meta/package.xml | 4 | ||||
-rw-r--r-- | installerfw.pri | 6 |
6 files changed, 22 insertions, 19 deletions
diff --git a/.qmake.conf b/.qmake.conf index 360239e14..4109ad569 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,2 +1,2 @@ -VERSION=4.5.1 +VERSION=4.5.2 CONFIG=prepare_docs qt_docs_targets $$CONFIG @@ -1,3 +1,6 @@ +4.5.2 +- Fix freezing UI while searching components (QTIFW-2886) + 4.5.1 - Make Settings operation to support _OLD and placeholders (QTIFW-2882) - ExtractOp: fix leftover empty directories when 'targetDir' arg is used (QTIFW-2764) diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml index d2cc70156..13bfe736a 100644 --- a/coin/instructions/make_instructions.yaml +++ b/coin/instructions/make_instructions.yaml @@ -77,13 +77,13 @@ instructions: - type: ChangeDirectory directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}" - type: ExecuteCommand - command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-x64-4.5.1.run" + command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-x64-4.5.2.run" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to create ifw installer." - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-4.5.1.run" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-4.5.1.run" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-4.5.2.run" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-4.5.2.run" userMessageOnFailure: "Failed to copy installer." enable_if: condition: and @@ -97,7 +97,7 @@ instructions: - type: ChangeDirectory directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}" - type: ExecuteCommand - command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-macOS-x64-4.5.1.app" + command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-macOS-x64-4.5.2.app" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to create ifw installer." @@ -117,18 +117,18 @@ instructions: maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed to install Pipenv requirements" - type: ExecuteCommand - command: "python3 -m pipenv run python sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.5.1.app" + command: "python3 -m pipenv run python sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.5.2.app" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to sign the ifw installer" - type: ExecuteCommand - command: "python3 -m pipenv run python notarize.py --dmg={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.5.1.dmg" + command: "python3 -m pipenv run python notarize.py --dmg={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.5.2.dmg" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to notarize the ifw installer" - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.5.1.dmg" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-4.5.1.dmg" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.5.2.dmg" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-4.5.2.dmg" userMessageOnFailure: "Failed to copy installer." enable_if: condition: and @@ -142,7 +142,7 @@ instructions: - type: ChangeDirectory directory: "{{.SourceDir}}" - type: ExecuteCommand - command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller --target-name QtInstallerFramework-windows-x64-4.5.1" + command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller --target-name QtInstallerFramework-windows-x64-4.5.2" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 1200 userMessageOnFailure: "Failed to create ifw installer." @@ -163,8 +163,8 @@ instructions: equals_value: Windows - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x64-4.5.1.exe" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x64-4.5.1.exe" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x64-4.5.2.exe" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x64-4.5.2.exe" userMessageOnFailure: "Failed to copy installer." enable_if: condition: property diff --git a/dist/packages/org.qtproject.ifw.binaries/meta/package.xml b/dist/packages/org.qtproject.ifw.binaries/meta/package.xml index fd3052b65..eb838e1b3 100644 --- a/dist/packages/org.qtproject.ifw.binaries/meta/package.xml +++ b/dist/packages/org.qtproject.ifw.binaries/meta/package.xml @@ -2,7 +2,7 @@ <Package> <DisplayName>Qt Installer Framework Binaries</DisplayName> <Description>Installs the binaries, examples and help files.</Description> - <Version>4.5.1</Version> - <ReleaseDate>2022-07-07</ReleaseDate> + <Version>4.5.2</Version> + <ReleaseDate>2022-01-13</ReleaseDate> <Default>True</Default> </Package> diff --git a/dist/packages/org.qtproject.ifw/meta/package.xml b/dist/packages/org.qtproject.ifw/meta/package.xml index cf28ccf1b..b0dd4ee57 100644 --- a/dist/packages/org.qtproject.ifw/meta/package.xml +++ b/dist/packages/org.qtproject.ifw/meta/package.xml @@ -2,8 +2,8 @@ <Package> <DisplayName>Qt Installer Framework</DisplayName> <Description>Installs the Qt Installer Framework.</Description> - <Version>4.5.1</Version> - <ReleaseDate>2022-07-07</ReleaseDate> + <Version>4.5.2</Version> + <ReleaseDate>2022-01-13</ReleaseDate> <Licenses> <License name="The Qt Company GPL Exception 1.0" file="LICENSE.GPL3-EXCEPT" /> <License name="Third Party Code Licenses" file="3RDPARTY" /> diff --git a/installerfw.pri b/installerfw.pri index 49b205a98..0c8504060 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,9 +3,9 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION_STR = 4.5.1 -IFW_VERSION = 0x040501 -IFW_VERSION_WIN32 = 4,5,1,0 +IFW_VERSION_STR = 4.5.2 +IFW_VERSION = 0x040502 +IFW_VERSION_WIN32 = 4,5,2,0 IFW_VERSION_STR_WIN32 = $$IFW_VERSION_STR\0 |