Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Windows installer always register ocx files #7979

Merged
merged 1 commit into from
May 8, 2020
Merged

Windows installer always register ocx files #7979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cmake/qtifw/install_win_copydll.qs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ function Component()
// (=overwrite with no prompt) isn't needed since we tested target
// didn't exist already
component.addElevatedOperation("Execute", "cmd", "/C", "copy", sourceFile, targetFile, "/Y");
// Register it: Only for "OCX"
// If it's a .ocx (case insensitive), we save it to be registered
if (systemArray[i].toLowerCase().indexOf(".ocx") !== -1) {
dllsToReg.push(targetFile);
}
}
// Register it: Only for "OCX"
// On some systems these files may be present but not properly registered, so always register here
// If it's a .ocx (case insensitive), we save it to be registered
if (systemArray[i].toLowerCase().indexOf(".ocx") !== -1) {
dllsToReg.push(targetFile);
Comment on lines +56 to +60
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this out of the if (!installer.fileExists(targetFile)) { block so that the ocx files are always registered, even if they already were present.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great change.

}
}

Expand Down