diff options
Diffstat (limited to 'src/libs/installer/registerfiletypeoperation.cpp')
-rw-r--r-- | src/libs/installer/registerfiletypeoperation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp index c1ee7a038..852714dfb 100644 --- a/src/libs/installer/registerfiletypeoperation.cpp +++ b/src/libs/installer/registerfiletypeoperation.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -105,7 +105,7 @@ bool RegisterFileTypeOperation::performOperation() allUsers = true; QSettingsWrapper settings(QLatin1String(allUsers ? "HKEY_LOCAL_MACHINE" : "HKEY_CURRENT_USER") - , QSettingsWrapper::NativeFormat); + , QSettings::NativeFormat); const QString classesProgId = QString::fromLatin1("Software/Classes/") + m_progId; const QString classesFileType = QString::fromLatin1("Software/Classes/.%2").arg(args.at(0)); @@ -153,7 +153,7 @@ bool RegisterFileTypeOperation::undoOperation() { #ifdef Q_OS_WIN ensureOptionalArgumentsRead(); - if (parseUndoOperationArguments().count() > 0) + if (skipUndoOperation()) return true; QStringList args = arguments(); @@ -166,7 +166,7 @@ bool RegisterFileTypeOperation::undoOperation() allUsers = true; QSettingsWrapper settings(QLatin1String(allUsers ? "HKEY_LOCAL_MACHINE" : "HKEY_CURRENT_USER") - , QSettingsWrapper::NativeFormat); + , QSettings::NativeFormat); const QString classesProgId = QString::fromLatin1("Software/Classes/") + m_progId; const QString classesFileType = QString::fromLatin1("Software/Classes/.%2").arg(args.at(0)); |