Merge branch 'develop' into feature/sparkle-mac

# Conflicts:
#	.github/workflows/build.yml

4 files changed, 13 insertions, 11 deletions

diff --git a/libraries/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt
index fc510e68..05412c30 100644
--- a/libraries/classparser/CMakeLists.txt
+++ b/libraries/classparser/CMakeLists.txt
@@ -10,10 +10,11 @@ if(${BIGENDIAN})
 endif(${BIGENDIAN})
 
 # Find Qt
-find_package(Qt5Core REQUIRED)
-
-# Include Qt headers.
-include_directories(${Qt5Base_INCLUDE_DIRS})
+if(QT_VERSION_MAJOR EQUAL 5)
+    find_package(Qt5 COMPONENTS Core REQUIRED)
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
+    find_package(Qt6 COMPONENTS Core REQUIRED)
+endif()
 
 set(CLASSPARSER_HEADERS
 # Public headers
@@ -38,4 +39,4 @@ add_definitions(-DCLASSPARSER_LIBRARY)
 
 add_library(Launcher_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
 target_include_directories(Launcher_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries(Launcher_classparser QuaZip::QuaZip Qt5::Core)
+target_link_libraries(Launcher_classparser QuaZip::QuaZip Qt${QT_VERSION_MAJOR}::Core)
diff --git a/libraries/classparser/src/annotations.cpp b/libraries/classparser/src/annotations.cpp
index 18a9e880..89b201bc 100644
--- a/libraries/classparser/src/annotations.cpp
+++ b/libraries/classparser/src/annotations.cpp
@@ -79,7 +79,7 @@ element_value *element_value::readElementValue(util::membuffer &input,
         }
         return new element_value_array(ARRAY, vals, pool);
     default:
-        throw new java::classfile_exception();
+        throw java::classfile_exception();
     }
 }
-}
\ No newline at end of file
+}
diff --git a/libraries/classparser/src/classfile.h b/libraries/classparser/src/classfile.h
index 1616a828..d629dde1 100644
--- a/libraries/classparser/src/classfile.h
+++ b/libraries/classparser/src/classfile.h
@@ -17,7 +17,7 @@ public:
         is_synthetic = false;
         read_be(magic);
         if (magic != 0xCAFEBABE)
-            throw new classfile_exception();
+            throw classfile_exception();
         read_be(minor_version);
         read_be(major_version);
         constants.load(*this);
@@ -153,4 +153,4 @@ public:
     // FIXME: doesn't free up memory on delete
     java::annotation_table visible_class_annotations;
 };
-}
\ No newline at end of file
+}
diff --git a/libraries/classparser/src/constants.h b/libraries/classparser/src/constants.h
index 3b6c3b7a..47b325b9 100644
--- a/libraries/classparser/src/constants.h
+++ b/libraries/classparser/src/constants.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "errors.h"
+#include "membuffer.h"
 #include <sstream>
 
 namespace java
@@ -90,7 +91,7 @@ public:
             break;
         default:
             // invalid constant type!
-            throw new classfile_exception();
+            throw classfile_exception();
         }
     }
     constant(int)
@@ -210,7 +211,7 @@ public:
     {
         if (constant_index == 0 || constant_index > constants.size())
         {
-            throw new classfile_exception();
+            throw classfile_exception();
         }
         return constants[constant_index - 1];
     }