From 1b4599229dfec7e75106c2cf4c4328d9b39e755c Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Tue, 24 Jan 2023 15:32:07 -0800
Subject: [PATCH 1/2] remove inline to fix building on Windows

---
 minikube.pro      |  1 +
 src/constants.cpp | 25 +++++++++++++++++++++++++
 src/constants.h   | 14 +++++++-------
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 src/constants.cpp

diff --git a/minikube.pro b/minikube.pro
index 6db0902..4b3c169 100644
--- a/minikube.pro
+++ b/minikube.pro
@@ -18,6 +18,7 @@ SOURCES       = src/main.cpp \
                 src/basicview.cpp \
                 src/cluster.cpp \
                 src/commandrunner.cpp \
+                src/constants.cpp \
                 src/errormessage.cpp \
                 src/fonts.cpp \
                 src/hyperkit.cpp \
diff --git a/src/constants.cpp b/src/constants.cpp
new file mode 100644
index 0000000..53032a3
--- /dev/null
+++ b/src/constants.cpp
@@ -0,0 +1,25 @@
+/*
+Copyright 2023 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include "constants.h"
+
+const QString Constants::startIcon = "\uf04b";
+const QString Constants::stopIcon = "\uf04d";
+const QString Constants::pauseIcon = "\uf04c";
+const QString Constants::unPauseIcon = "\uf04b";
+const QString Constants::deleteIcon = "\uf1f8";
+const QString Constants::reloadIcon = "\uf021";
+const QString Constants::createIcon = "\uf0fe"
diff --git a/src/constants.h b/src/constants.h
index d9a1246..fb80616 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -24,13 +24,13 @@ class Constants
 public:
     const static int basicViewHeight = 300;
     const static int basicViewWidth = 250;
-    inline static const QString startIcon = "\uf04b";
-    inline static const QString stopIcon = "\uf04d";
-    inline static const QString pauseIcon = "\uf04c";
-    inline static const QString unPauseIcon = "\uf04b";
-    inline static const QString deleteIcon = "\uf1f8";
-    inline static const QString reloadIcon = "\uf021";
-    inline static const QString createIcon = "\uf0fe";
+    static const QString startIcon;
+    static const QString stopIcon;
+    static const QString pauseIcon;
+    static const QString unPauseIcon;
+    static const QString deleteIcon;
+    static const QString reloadIcon;
+    static const QString createIcon;
 };
 
 #endif // CONSTANTS_H

From 94b4d88e30612560cb66873196ad7258457dcaee Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Tue, 24 Jan 2023 16:55:19 -0800
Subject: [PATCH 2/2] add missing semicolon after merge conflict

---
 src/constants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.cpp b/src/constants.cpp
index 53032a3..dcb53be 100644
--- a/src/constants.cpp
+++ b/src/constants.cpp
@@ -22,4 +22,4 @@ const QString Constants::pauseIcon = "\uf04c";
 const QString Constants::unPauseIcon = "\uf04b";
 const QString Constants::deleteIcon = "\uf1f8";
 const QString Constants::reloadIcon = "\uf021";
-const QString Constants::createIcon = "\uf0fe"
+const QString Constants::createIcon = "\uf0fe";