diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-04-06 13:59:11 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-04-09 09:50:03 +0300 |
commit | 90523cb44306949893b5ae0f3706185c7d364c6f (patch) | |
tree | 285ffe703d752caf91d108980b6c004ced07ffe0 /src/libs/installer/packagemanagercoredata.cpp | |
parent | a58ec153e6e2f91e7cfa89c15ecd222c29bf3fb9 (diff) |
Fix shortcut creation when installing from CLI
Change default button from Retry to Cancel if operation fails to avoid
infinite loop when running from command line interface.
Added also unit tests for shortcut operation.
Task-number: QTIFW-1666 QTIFW-1710
Change-Id: I171b6aecd9886acce0051b7082842f8f76b22046
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercoredata.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index df6d96a55..667e2f577 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -167,9 +167,9 @@ void PackageManagerCoreData::setDynamicPredefinedVariables() desktop = user.value(QLatin1String("Desktop")).toString(); } m_variables.insert(QLatin1String("DesktopDir"), replaceWindowsEnvironmentVariables(desktop)); - m_variables.insert(QLatin1String("UserStartMenuProgramsPath"), + m_variables.insert(scUserStartMenuProgramsPath, replaceWindowsEnvironmentVariables(programs)); - m_variables.insert(QLatin1String("AllUsersStartMenuProgramsPath"), + m_variables.insert(scAllUsersStartMenuProgramsPath, replaceWindowsEnvironmentVariables(allPrograms)); #endif #define QUOTE_(x) #x |