Upgraded Qt to version 6.2.4 (LTS)
This commit is contained in:
Nav
@@ -59,7 +59,7 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
# CMAKE_BUILD_RPATH needs to point to the local Qt installation, to use Gammaray during development.
|
||||
# This is because the distributed Qt binaries may not be compatible with the local installation of Gammaray
|
||||
# If you don't intend to use Gammaray, you can comment this out
|
||||
set(CMAKE_BUILD_RPATH /opt/Qt/6.1.2/gcc_64/lib/)
|
||||
set(CMAKE_BUILD_RPATH /opt/Qt/6.2.4/gcc_64/lib/)
|
||||
endif()
|
||||
|
||||
add_executable(Bloom)
|
||||
@@ -80,7 +80,7 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
# The QT source directory is specified as an include path just so that CLion can navigate to the Qt implementation
|
||||
# files, during debugging. No QT headers are actually included via this method. Feel free to comment this out if
|
||||
# you don't possess the Qt source code on your machine. You may need to invalidate CMake cache.
|
||||
target_include_directories(Bloom PUBLIC /opt/Qt/6.1.2/Src)
|
||||
target_include_directories(Bloom PUBLIC /opt/Qt/6.2.4/Src)
|
||||
endif()
|
||||
|
||||
target_link_libraries(Bloom -lstdc++fs)
|
||||
|
||||
@@ -1 +1 @@
|
||||
./libQt6Core.so.6.1.2
|
||||
libQt6Core.so.6.2.4
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6DBus.so.6.1.2
|
||||
libQt6DBus.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6DBus.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6DBus.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6Gui.so.6.1.2
|
||||
libQt6Gui.so.6.2.4
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
libQt6Network.so.6.1.2
|
||||
libQt6Network.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6Network.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6Network.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
libQt6OpenGL.so.6.1.2
|
||||
libQt6OpenGL.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6OpenGL.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6OpenGL.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
libQt6OpenGLWidgets.so.6.1.2
|
||||
libQt6OpenGLWidgets.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6OpenGLWidgets.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6OpenGLWidgets.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6Svg.so.6.1.2
|
||||
libQt6Svg.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6Svg.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6Svg.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6SvgWidgets.so.6.1.2
|
||||
libQt6SvgWidgets.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6SvgWidgets.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6SvgWidgets.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6UiTools.so.6.1.2
|
||||
libQt6UiTools.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6UiTools.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6UiTools.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6Widgets.so.6.1.2
|
||||
libQt6Widgets.so.6.2.4
|
||||
Binary file not shown.
1
build/bin/lib/libQt6XcbQpa.so
Symbolic link
1
build/bin/lib/libQt6XcbQpa.so
Symbolic link
@@ -0,0 +1 @@
|
||||
libQt6XcbQpa.so.6
|
||||
@@ -1 +1 @@
|
||||
./libQt6XcbQpa.so.6.1.2
|
||||
libQt6XcbQpa.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6XcbQpa.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6XcbQpa.so.6.2.4
Executable file
Binary file not shown.
@@ -1 +1 @@
|
||||
./libQt6Xml.so.6.1.2
|
||||
libQt6Xml.so.6.2.4
|
||||
Binary file not shown.
BIN
build/bin/lib/libQt6Xml.so.6.2.4
Executable file
BIN
build/bin/lib/libQt6Xml.so.6.2.4
Executable file
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
./libqxcb.so
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -10,9 +10,9 @@ rm -fr Bloom-*.rpm;
|
||||
rm -fr bloom-*.pkg.tar.zst;
|
||||
rm -fr "_CPack_Packages";
|
||||
|
||||
export CMAKE_PREFIX_PATH=/opt/Qt/6.1.2/gcc_64/
|
||||
export CMAKE_PREFIX_PATH=/opt/Qt/6.2.4/gcc_64/
|
||||
|
||||
cd build/cmake-build-release/ && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/local/install/bin/g++ ../../
|
||||
cd build/cmake-build-release/ && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/bin/g++ ../../
|
||||
cd /home/nav/Projects/Bloom/ && cmake --build /home/nav/Projects/Bloom/build/cmake-build-release --target clean
|
||||
|
||||
cmake --build /home/nav/Projects/Bloom/build/cmake-build-release --target Bloom
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace Bloom
|
||||
, insightProjectSettings(insightProjectSettings)
|
||||
, application(
|
||||
(
|
||||
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, false),
|
||||
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true),
|
||||
#ifndef BLOOM_DEBUG_BUILD
|
||||
QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/plugins")),
|
||||
#endif
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
<!DOCTYPE RCC>
|
||||
<RCC version="1.0">
|
||||
<qresource>
|
||||
<!--
|
||||
CAUTION: For aliases, please be sure to use the path of the file, relative to the Bloom project dir, but prefixed
|
||||
with "/compiled/". See below for examples.
|
||||
|
||||
This is required because Bloom does not use compiled resources for debug builds. Instead, it will use the files
|
||||
located in the Bloom project directory. See comment for BLOOM_COMPILED_RESOURCES_PATH_OVERRIDE macro
|
||||
in CMakeLists.txt for more.
|
||||
-->
|
||||
|
||||
<!-- The contents of help.txt is presented to the user in response to the invocation of the help command -->
|
||||
<file alias="/compiled/resources/help.txt">../resources/help.txt</file>
|
||||
|
||||
<!-- The contents of gdbHelpMonitorInfo.txt is presented to the user in response to the invocation of the "monitor help" GDB command -->
|
||||
<file alias="/compiled/resources/gdbHelpMonitorInfo.txt">../resources/gdbHelpMonitorInfo.txt</file>
|
||||
|
||||
<!-- The bloom.template.json is a template configuration file that is used to initiate a new project, via the init command -->
|
||||
<file alias="/compiled/resources/bloom.template.json">../resources/bloom.template.json</file>
|
||||
|
||||
<!-- Insight window -->
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Stylesheets/Global.qss">./Insight/UserInterfaces/InsightWindow/Stylesheets/Global.qss</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui">./Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss">./Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/UiFiles/TargetRegistersSidePane.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/UiFiles/TargetRegistersSidePane.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/UiFiles/TargetMemoryInspectionPane.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg">./Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Images/RAM.svg">./Insight/UserInterfaces/InsightWindow/Images/RAM.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Images/refresh.svg">./Insight/UserInterfaces/InsightWindow/Images/refresh.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Images/refresh-disabled.svg">./Insight/UserInterfaces/InsightWindow/Images/refresh-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Images/down-arrow.svg">./Insight/UserInterfaces/InsightWindow/Images/down-arrow.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/collapse-all.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/collapse-all.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/expand-all.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/expand-all.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/arrow.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/arrow.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/register-group.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/register-group.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/register.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/register.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/target-registers.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/target-registers.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/target-registers-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/target-registers-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/search-registers.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/Images/search-registers.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-stack-memory.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-stack-memory.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-stack-memory-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-stack-memory-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-focused-memory.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-focused-memory.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-focused-memory-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-focused-memory-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/manage-focused-regions.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/manage-focused-regions.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-hovered-rows-columns.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-hovered-rows-columns.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-hovered-rows-columns-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/highlight-hovered-rows-columns-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/display-annotations.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/display-annotations.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/display-annotations-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/display-annotations-disabled.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/ascii-view.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/ascii-view.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/ascii-view-disabled.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/Images/ascii-view-disabled.svg</file>
|
||||
|
||||
<!-- Target package widgets -->
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss">./Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss">./Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss</file>
|
||||
|
||||
<!-- Target register inspector window -->
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/UiFiles/RegisterHistoryWidget.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/RegisterHistoryWidget/UiFiles/RegisterHistoryWidget.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Images/icon.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Images/icon.svg</file>
|
||||
|
||||
<!-- Focused memory region manager window -->
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/UiFiles/MemoryRegionManagerWindow.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/UiFiles/MemoryRegionManagerWindow.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Stylesheets/MemoryRegionManagerWindow.qss">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Stylesheets/MemoryRegionManagerWindow.qss</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/UiFiles/FocusedMemoryRegionForm.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/UiFiles/FocusedMemoryRegionForm.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/UiFiles/ExcludedMemoryRegionForm.ui">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/UiFiles/ExcludedMemoryRegionForm.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Images/icon.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Images/icon.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Images/add-region.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Images/add-region.svg</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Images/remove-region.svg">./Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/Images/remove-region.svg</file>
|
||||
|
||||
<!-- About window -->
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui">./Insight/UserInterfaces/InsightWindow/UiFiles/AboutWindow.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss">./Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss</file>
|
||||
|
||||
<!-- Error dialogue -->
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui">./Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/UiFiles/ErrorDialogue.ui</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/Stylesheets/ErrorDialogue.qss">./Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/Stylesheets/ErrorDialogue.qss</file>
|
||||
<file alias="/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/Images/icon.svg">./Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/Images/icon.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
Reference in New Issue
Block a user