Fix build UE version before 5.2

SRombauts · Jun 12, 2023 · 30039b3 · 30039b3
1 parent b815e2d
commit 30039b3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/Source/GitSourceControl/GitSourceControl.Build.cs b/Source/GitSourceControl/GitSourceControl.Build.cs
@@ -9,7 +9,6 @@ public class GitSourceControl : ModuleRules
 {
 	public GitSourceControl(ReadOnlyTargetRules Target) : base(Target)
 	{
-		IWYUSupport = IWYUSupport.Full;
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 		PrivatePCHHeaderFile = "Private/GitSourceControlPrivatePCH.h";
 
@@ -23,7 +22,6 @@ public GitSourceControl(ReadOnlyTargetRules Target) : base(Target)
 				"DesktopWidgets",
 				"EditorStyle",
 				"UnrealEd",
-			//?	"LevelEditor",
 				"SourceControl",
 				"Projects",
 			}

diff --git a/Source/GitSourceControl/Private/GitSourceControlState.h b/Source/GitSourceControl/Private/GitSourceControlState.h
@@ -61,6 +61,7 @@ class FGitSourceControlState : public ISourceControlState
 	virtual TSharedPtr<class ISourceControlRevision, ESPMode::ThreadSafe> FindHistoryRevision(int32 RevisionNumber) const override;
 	virtual TSharedPtr<class ISourceControlRevision, ESPMode::ThreadSafe> FindHistoryRevision(const FString& InRevision) const override;
 	virtual TSharedPtr<class ISourceControlRevision, ESPMode::ThreadSafe> GetBaseRevForMerge() const override;
+	virtual TSharedPtr<class ISourceControlRevision, ESPMode::ThreadSafe> GetCurrentRevision() const; /* override	NOTE: added in UE5.2 */
 #if ENGINE_MAJOR_VERSION == 5
 	virtual FSlateIcon GetIcon() const override;
 #else
@@ -93,7 +94,6 @@ class FGitSourceControlState : public ISourceControlState
 	virtual bool CanDelete() const override;
 	virtual bool IsConflicted() const override;
 	virtual bool CanRevert() const override;
-	virtual TSharedPtr<ISourceControlRevision, ESPMode::ThreadSafe> GetCurrentRevision() const override;
 
 public:
 	/** History of the item, if any */

diff --git a/Source/GitSourceControl/Private/SGitSourceControlSettings.cpp b/Source/GitSourceControl/Private/SGitSourceControlSettings.cpp
@@ -23,7 +23,12 @@
 #include "Widgets/Notifications/SNotificationList.h"
 #include "Framework/Notifications/NotificationManager.h"
 #include "EditorDirectories.h"
+#include "Runtime/Launch/Resources/Version.h"
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1
+#include "Styling/AppStyle.h"
+#else
 #include "EditorStyleSet.h"
+#endif
 #include "SourceControlOperations.h"
 #include "GitSourceControlModule.h"
 #include "GitSourceControlUtils.h"
@@ -32,7 +37,11 @@
 
 void SGitSourceControlSettings::Construct(const FArguments& InArgs)
 {
-	const FSlateFontInfo Font = FAppStyle::Get().GetFontStyle(TEXT("SourceControl.LoginWindow.Font"));
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1
+	const FSlateFontInfo Font = FAppStyle::GetFontStyle(TEXT("SourceControl.LoginWindow.Font"));
+#else
+	const FSlateFontInfo Font = FEditorStyle::GetFontStyle(TEXT("SourceControl.LoginWindow.Font"));
+#endif
 
 	bAutoCreateGitIgnore = true;
 	bAutoCreateReadme = true;
@@ -52,10 +61,12 @@ void SGitSourceControlSettings::Construct(const FArguments& InArgs)
 
 	ChildSlot
 	[
+#if ENGINE_MAJOR_VERSION == 4
 		SNew(SBorder)
-		.BorderImage(FAppStyle::Get().GetBrush("DetailsView.CategoryBottom"))
+		.BorderImage(FEditorStyle::GetBrush("DetailsView.CategoryBottom"))
 		.Padding(FMargin(0.0f, 3.0f, 0.0f, 0.0f))
 		[
+#endif
 			SNew(SVerticalBox)
 			// Path to the Git command line executable
 			+ SVerticalBox::Slot()
@@ -76,8 +87,13 @@ void SGitSourceControlSettings::Construct(const FArguments& InArgs)
 				.FillWidth(2.0f)
 				[
 					SNew(SFilePathPicker)
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1
 					.BrowseButtonImage(FAppStyle::Get().GetBrush("PropertyWindow.Button_Ellipsis"))
 					.BrowseButtonStyle(FAppStyle::Get(), "HoverHintOnly")
+#else
+					.BrowseButtonImage(FEditorStyle::GetBrush("PropertyWindow.Button_Ellipsis"))
+					.BrowseButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
+#endif
 					.BrowseDirectory(FEditorDirectories::Get().GetLastDirectory(ELastDirectory::GENERIC_OPEN))
 					.BrowseTitle(LOCTEXT("BinaryPathBrowseTitle", "File picker..."))
 					.FilePath(this, &SGitSourceControlSettings::GetBinaryPathString)
@@ -419,7 +435,9 @@ void SGitSourceControlSettings::Construct(const FArguments& InArgs)
 					.ContentPadding(6)
 				]
 			]
+#if ENGINE_MAJOR_VERSION == 4
 		]
+#endif
 	];
 }
 
@@ -673,7 +691,11 @@ void SGitSourceControlSettings::DisplaySuccessNotification(const FSourceControlO
 	const FText NotificationText = FText::Format(LOCTEXT("InitialCommit_Success", "{0} operation was successfull!"), FText::FromName(InOperation->GetName()));
 	FNotificationInfo Info(NotificationText);
 	Info.bUseSuccessFailIcons = true;
-	Info.Image = FAppStyle::Get().GetBrush(TEXT("NotificationList.SuccessImage"));
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1
+	Info.Image = FAppStyle::GetBrush(TEXT("NotificationList.SuccessImage"));
+#else
+	Info.Image = FEditorStyle::GetBrush(TEXT("NotificationList.SuccessImage"));
+#endif
 	FSlateNotificationManager::Get().AddNotification(Info);
 }