citra_qt: Fix remaining build errors

src/citra_qt/debugger/profiler.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <QWidget>
+#include "common/common_types.h"
 #include "common/microprofile.h"
 
 class MicroProfileDialog : public QWidget {

src/citra_qt/debugger/registers.h

@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <QDockWidget>
+#include "common/common_types.h"
 
 class QTreeWidget;
 class QTreeWidgetItem;

src/citra_qt/main.cpp

@@ -15,6 +15,7 @@
 #include <QtGui>
 #include <QtWidgets>
 #include <fmt/format.h>
+#include <fmt/ostream.h>
 #ifdef __APPLE__
 #include <unistd.h> // for chdir
 #endif
@@ -82,6 +83,7 @@
 #include "common/x64/cpu_detect.h"
 #endif
 #include "common/settings.h"
+#include "common/string_util.h"
 #include "core/core.h"
 #include "core/dumping/backend.h"
 #include "core/file_sys/archive_extsavedata.h"
@@ -1844,7 +1846,7 @@ bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_vi
     out_icon_path = FileUtil::GetUserPath(FileUtil::UserPath::IconsDir);
     ico_extension = "ico";
 #elif defined(__linux__) || defined(__FreeBSD__)
-    out_icon_path = FileUtil::GetDataDirectory("XDG_DATA_HOME") / "icons/hicolor/256x256";
+    out_icon_path = FileUtil::GetUserDirectory("XDG_DATA_HOME") + "icons/hicolor/256x256";
 #endif
     // Create icons directory if it doesn't exist
     if (!FileUtil::CreateDir(out_icon_path.string())) {

src/citra_qt/main.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <array>
-#include <filesystem>
 #include <memory>
 #include <vector>
 #include <QMainWindow>
@@ -22,6 +21,9 @@
 #include <QDBusObjectPath>
 #endif
 
+// Needs to be included at the end due to https://bugreports.qt.io/browse/QTBUG-73263
+#include <filesystem>
+
 class AboutDialog;
 class Config;
 class ClickableLabel;

src/citra_qt/uisettings.h

@@ -149,6 +149,8 @@ struct Values {
 
     // logging
     Settings::Setting<bool> show_console{false, "showConsole"};
+
+    bool shortcut_already_warned = false;
 };
 
 extern Values values;

src/citra_qt/util/util.cpp

@@ -6,6 +6,7 @@
 #include <cmath>
 #include <QPainter>
 #include "citra_qt/util/util.h"
+#include "common/logging/log.h"
 #include "core/loader/smdh.h"
 
 #ifdef _WIN32
@@ -43,7 +44,7 @@ QPixmap CreateCirclePixmapFromColor(const QColor& color) {
     return circle_pixmap;
 }
 
-QPixmap GetQPixmapFromSMDH(std::vector<u8>& smdh_data) {
+QPixmap GetQPixmapFromSMDH(const std::vector<u8>& smdh_data) {
     Loader::SMDH smdh;
     std::memcpy(&smdh, smdh_data.data(), sizeof(Loader::SMDH));
 

src/citra_qt/util/util.h

@@ -7,6 +7,7 @@
 #include <filesystem>
 #include <QFont>
 #include <QString>
+#include "common/common_types.h"
 
 /// Returns a QFont object appropriate to use as a monospace font for debugging widgets, etc.
 QFont GetMonospaceFont();
@@ -26,7 +27,7 @@ QPixmap CreateCirclePixmapFromColor(const QColor& color);
  * @param smdh_data SMDH data
  * @return QPixmap game icon
  */
-QPixmap GetQPixmapFromSMDH(std::vector<u8>& smdh_data);
+QPixmap GetQPixmapFromSMDH(const std::vector<u8>& smdh_data);
 
 /**
  * Saves a windows icon to a file
@@ -34,4 +35,4 @@ QPixmap GetQPixmapFromSMDH(std::vector<u8>& smdh_data);
  * @param image The image to save
  * @return bool If the operation succeeded
  */
-[[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image);
+[[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image);