Skip to content

Commit da3b1ac

Browse files
BenLeadbetterWaqar144
authored andcommitted
fix: compile error in staticinjectiontest against qt6
1 parent 9ddbb86 commit da3b1ac

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

core/staticprobe.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
* the better option anyway.
2424
*/
2525
#ifdef QT_CORE_LIB
26+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
2627
Q_IMPORT_PLUGIN(CodecBrowserFactory)
28+
#endif
2729
Q_IMPORT_PLUGIN(EventMonitorFactory)
2830
Q_IMPORT_PLUGIN(SignalMonitorFactory)
2931
Q_IMPORT_PLUGIN(StateMachineViewerFactory)

tests/manual/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ if(GAMMARAY_STATIC_PROBE)
9797
gammaray_probe
9898
Qt::Widgets
9999
gammaray_actioninspector_plugin
100-
gammaray_codecbrowser_plugin
101100
gammaray_eventmonitor_plugin
102101
gammaray_guisupport
103102
gammaray_fontbrowser_plugin
@@ -113,4 +112,7 @@ if(GAMMARAY_STATIC_PROBE)
113112
# gammaray_quickinspector
114113
# gammaray_webinspector_plugin
115114
)
115+
if(${QT_VERSION_MAJOR} EQUAL 5 AND TARGET Qt5::Core)
116+
target_link_libraries(staticinjectiontest gammaray_codecbrowser_plugin)
117+
endif()
116118
endif()

0 commit comments

Comments
 (0)