Merge remote-tracking branch 'upstream/master' into qt-wacom-serial

2023-02-15 11:12:25 +06:00
parent 64becf5d13 071ecea6a0
commit 0f36ad9f04
66 changed files with 2938 additions and 710 deletions
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -43,7 +43,7 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
 #    include "qt_winrawinputfilter.hpp"
 #    include "qt_winmanagerfilter.hpp"
 #    include <86box/win.h>
-#    include <Shobjidl.h>
+#    include <shobjidl.h>
 #endif

 extern "C" {