diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:05:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:34:54 +0200 |
| commit | 4f56da239de91cc1a1fdf3138bad5fff86b2bf96 (patch) | |
| tree | f37320148810fc62910fc9c16eee3ea8a64ae0d8 /scp2/inc/macros.inc | |
| parent | 8dac2cc0b93d51e9b3fff652ed1f2f4730b5c1c2 (diff) | |
scp2: remove all ComponentConditions that test Windows versions
Windows 7 (6.01) has all the features we want.
Change-Id: I96356b2decb26af526bceda8081875d418f17274
Diffstat (limited to 'scp2/inc/macros.inc')
| -rw-r--r-- | scp2/inc/macros.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index fc17096b7f48..41c1040edd09 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -294,7 +294,6 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - ComponentCondition = STRING(VersionNT >= 601); \ Subkey = STRING(CONCAT2(LibreOffice.,name)); \ Name = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ @@ -435,7 +434,6 @@ End RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ ModuleID = gid_Module_Optional_Winexplorerext; \ - ComponentCondition = "VersionNT >= 600"; \ Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End \ @@ -443,7 +441,7 @@ End RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ ModuleID = gid_Module_Optional_Winexplorerext_x64; \ - ComponentCondition = "VersionNT64 >= 600"; \ + ComponentCondition = "VersionNT64"; \ Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End @@ -454,7 +452,6 @@ End RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ ModuleID = gid_Module_Optional_Winexplorerext; \ - ComponentCondition = "VersionNT >= 600"; \ Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End |