diff --git a/CMakeLists.txt b/CMakeLists.txt index 101ae814..d545626f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,12 +25,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(AUTOGEN_BUILD_DIR ../build/) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build/bin") -find_package(Qt5Core) -find_package(Qt5Gui) -find_package(Qt5Widgets) -find_package(Qt5Xml) -find_package(Qt5Svg) -find_package(Qt5UiTools) +find_package(Qt6Core) +find_package(Qt6Gui) +find_package(Qt6Widgets) +find_package(Qt6Xml) +find_package(Qt6Svg) +find_package(Qt6UiTools) set(CMAKE_SKIP_BUILD_RPATH false) set(CMAKE_BUILD_RPATH_USE_ORIGIN true) @@ -50,7 +50,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") # CMAKE_SKIP_BUILD_RPATH needs to be set to true to use Gammaray during development. # This is because the distributed Qt binaries may not be compatible with the local installation of Gammaray - set(CMAKE_SKIP_BUILD_RPATH true) + set(CMAKE_BUILD_RPATH /opt/Qt/6.1.2/gcc_64/lib/) endif() add_executable(Bloom @@ -172,12 +172,12 @@ target_link_libraries(Bloom -lstdc++fs) target_link_libraries(Bloom -lpthread) target_link_libraries(Bloom -lusb-1.0) target_link_libraries(Bloom -lhidapi-libusb) -target_link_libraries(Bloom Qt5::Core) -target_link_libraries(Bloom Qt5::Gui) -target_link_libraries(Bloom Qt5::UiTools) -target_link_libraries(Bloom Qt5::Widgets) -target_link_libraries(Bloom Qt5::Xml) -target_link_libraries(Bloom Qt5::Svg) +target_link_libraries(Bloom Qt6::Core) +target_link_libraries(Bloom Qt6::Gui) +target_link_libraries(Bloom Qt6::UiTools) +target_link_libraries(Bloom Qt6::Widgets) +target_link_libraries(Bloom Qt6::Xml) +target_link_libraries(Bloom Qt6::Svg) target_compile_options( Bloom diff --git a/build/lib/libQt5Core.so.5 b/build/lib/libQt5Core.so.5 deleted file mode 120000 index 9b3e7af5..00000000 --- a/build/lib/libQt5Core.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5Core.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5Core.so.5.12.10 b/build/lib/libQt5Core.so.5.12.10 deleted file mode 100644 index a61518bc..00000000 Binary files a/build/lib/libQt5Core.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt5DBus.so.5 b/build/lib/libQt5DBus.so.5 deleted file mode 120000 index 292aa1bb..00000000 --- a/build/lib/libQt5DBus.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5DBus.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5DBus.so.5.12.10 b/build/lib/libQt5DBus.so.5.12.10 deleted file mode 100755 index 51d47f83..00000000 Binary files a/build/lib/libQt5DBus.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt5Gui.so.5 b/build/lib/libQt5Gui.so.5 deleted file mode 120000 index 83ed1a02..00000000 --- a/build/lib/libQt5Gui.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5Gui.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5Gui.so.5.12.10 b/build/lib/libQt5Gui.so.5.12.10 deleted file mode 100644 index a513fb1f..00000000 Binary files a/build/lib/libQt5Gui.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt5Svg.so.5 b/build/lib/libQt5Svg.so.5 deleted file mode 120000 index d36545c4..00000000 --- a/build/lib/libQt5Svg.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5Svg.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5Svg.so.5.12.10 b/build/lib/libQt5Svg.so.5.12.10 deleted file mode 100755 index 4212b16c..00000000 Binary files a/build/lib/libQt5Svg.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt5Widgets.so.5 b/build/lib/libQt5Widgets.so.5 deleted file mode 120000 index c11f5d90..00000000 --- a/build/lib/libQt5Widgets.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5Widgets.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5Widgets.so.5.12.10 b/build/lib/libQt5Widgets.so.5.12.10 deleted file mode 100644 index eb3cab38..00000000 Binary files a/build/lib/libQt5Widgets.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt5XcbQpa.so.5 b/build/lib/libQt5XcbQpa.so.5 deleted file mode 120000 index 1abcbf07..00000000 --- a/build/lib/libQt5XcbQpa.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5XcbQpa.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5XcbQpa.so.5.12.10 b/build/lib/libQt5XcbQpa.so.5.12.10 deleted file mode 100644 index c1b0342b..00000000 Binary files a/build/lib/libQt5XcbQpa.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt5Xml.so.5 b/build/lib/libQt5Xml.so.5 deleted file mode 120000 index 3adfe610..00000000 --- a/build/lib/libQt5Xml.so.5 +++ /dev/null @@ -1 +0,0 @@ -./libQt5Xml.so.5.12.10 \ No newline at end of file diff --git a/build/lib/libQt5Xml.so.5.12.10 b/build/lib/libQt5Xml.so.5.12.10 deleted file mode 100644 index e9e69a78..00000000 Binary files a/build/lib/libQt5Xml.so.5.12.10 and /dev/null differ diff --git a/build/lib/libQt6Core.so.6 b/build/lib/libQt6Core.so.6 new file mode 120000 index 00000000..0d63f70a --- /dev/null +++ b/build/lib/libQt6Core.so.6 @@ -0,0 +1 @@ +./libQt6Core.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6Core.so.6.1.2 b/build/lib/libQt6Core.so.6.1.2 new file mode 100755 index 00000000..78a2330a Binary files /dev/null and b/build/lib/libQt6Core.so.6.1.2 differ diff --git a/build/lib/libQt6DBus.so.6 b/build/lib/libQt6DBus.so.6 new file mode 120000 index 00000000..1c649356 --- /dev/null +++ b/build/lib/libQt6DBus.so.6 @@ -0,0 +1 @@ +./libQt6DBus.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6DBus.so.6.1.2 b/build/lib/libQt6DBus.so.6.1.2 new file mode 100755 index 00000000..0cd08029 Binary files /dev/null and b/build/lib/libQt6DBus.so.6.1.2 differ diff --git a/build/lib/libQt6Gui.so b/build/lib/libQt6Gui.so new file mode 120000 index 00000000..dd0d1a0a --- /dev/null +++ b/build/lib/libQt6Gui.so @@ -0,0 +1 @@ +libQt6Gui.so.6 \ No newline at end of file diff --git a/build/lib/libQt6Gui.so.6 b/build/lib/libQt6Gui.so.6 new file mode 120000 index 00000000..5ce4dfda --- /dev/null +++ b/build/lib/libQt6Gui.so.6 @@ -0,0 +1 @@ +./libQt6Gui.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6Gui.so.6.1.2 b/build/lib/libQt6Gui.so.6.1.2 new file mode 100755 index 00000000..5dcdbc3c Binary files /dev/null and b/build/lib/libQt6Gui.so.6.1.2 differ diff --git a/build/lib/libQt6Svg.so b/build/lib/libQt6Svg.so new file mode 120000 index 00000000..171d6679 --- /dev/null +++ b/build/lib/libQt6Svg.so @@ -0,0 +1 @@ +libQt6Svg.so.6 \ No newline at end of file diff --git a/build/lib/libQt6Svg.so.6 b/build/lib/libQt6Svg.so.6 new file mode 120000 index 00000000..19eeac06 --- /dev/null +++ b/build/lib/libQt6Svg.so.6 @@ -0,0 +1 @@ +./libQt6Svg.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6Svg.so.6.1.2 b/build/lib/libQt6Svg.so.6.1.2 new file mode 100755 index 00000000..d8fedcea Binary files /dev/null and b/build/lib/libQt6Svg.so.6.1.2 differ diff --git a/build/lib/libQt6SvgWidgets.so.6 b/build/lib/libQt6SvgWidgets.so.6 new file mode 120000 index 00000000..c76e5ac5 --- /dev/null +++ b/build/lib/libQt6SvgWidgets.so.6 @@ -0,0 +1 @@ +./libQt6SvgWidgets.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6SvgWidgets.so.6.1.2 b/build/lib/libQt6SvgWidgets.so.6.1.2 new file mode 100755 index 00000000..cc10de8e Binary files /dev/null and b/build/lib/libQt6SvgWidgets.so.6.1.2 differ diff --git a/build/lib/libQt6UiTools.so.6 b/build/lib/libQt6UiTools.so.6 new file mode 120000 index 00000000..fa0b50ee --- /dev/null +++ b/build/lib/libQt6UiTools.so.6 @@ -0,0 +1 @@ +./libQt6UiTools.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6UiTools.so.6.1.2 b/build/lib/libQt6UiTools.so.6.1.2 new file mode 100755 index 00000000..9d9b3d80 Binary files /dev/null and b/build/lib/libQt6UiTools.so.6.1.2 differ diff --git a/build/lib/libQt6Widgets.so b/build/lib/libQt6Widgets.so new file mode 120000 index 00000000..21c80c70 --- /dev/null +++ b/build/lib/libQt6Widgets.so @@ -0,0 +1 @@ +libQt6Widgets.so.6 \ No newline at end of file diff --git a/build/lib/libQt6Widgets.so.6 b/build/lib/libQt6Widgets.so.6 new file mode 120000 index 00000000..fce75dd9 --- /dev/null +++ b/build/lib/libQt6Widgets.so.6 @@ -0,0 +1 @@ +./libQt6Widgets.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6Widgets.so.6.1.2 b/build/lib/libQt6Widgets.so.6.1.2 new file mode 100755 index 00000000..98ed83bf Binary files /dev/null and b/build/lib/libQt6Widgets.so.6.1.2 differ diff --git a/build/lib/libQt6XcbQpa.so.6 b/build/lib/libQt6XcbQpa.so.6 new file mode 120000 index 00000000..7812dc93 --- /dev/null +++ b/build/lib/libQt6XcbQpa.so.6 @@ -0,0 +1 @@ +./libQt6XcbQpa.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6XcbQpa.so.6.1.2 b/build/lib/libQt6XcbQpa.so.6.1.2 new file mode 100755 index 00000000..5e58be84 Binary files /dev/null and b/build/lib/libQt6XcbQpa.so.6.1.2 differ diff --git a/build/lib/libQt6Xml.so b/build/lib/libQt6Xml.so new file mode 120000 index 00000000..e9bbaf21 --- /dev/null +++ b/build/lib/libQt6Xml.so @@ -0,0 +1 @@ +libQt6Xml.so.6 \ No newline at end of file diff --git a/build/lib/libQt6Xml.so.6 b/build/lib/libQt6Xml.so.6 new file mode 120000 index 00000000..65b9efe7 --- /dev/null +++ b/build/lib/libQt6Xml.so.6 @@ -0,0 +1 @@ +./libQt6Xml.so.6.1.2 \ No newline at end of file diff --git a/build/lib/libQt6Xml.so.6.1.2 b/build/lib/libQt6Xml.so.6.1.2 new file mode 100755 index 00000000..c1107988 Binary files /dev/null and b/build/lib/libQt6Xml.so.6.1.2 differ