diff --git a/qt/model_view/sortProxyModel/test/CMakeLists.txt b/qt/model_view/sortProxyModel/test/CMakeLists.txt index 5694301..80414ae 100644 --- a/qt/model_view/sortProxyModel/test/CMakeLists.txt +++ b/qt/model_view/sortProxyModel/test/CMakeLists.txt @@ -14,6 +14,10 @@ find_package( Test ) +if (Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0") + find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED CorePrivate) +endif() + add_definitions(-DQT_DEPRECATED_WARNINGS) set(tst_sortproxymodeltest_SOURCES ../sortproxymodel.cpp ../sortproxymodel.h tst_sortproxymodeltest.cpp vectormodel.h) diff --git a/qt/qml/QmlStackTraceHelper/QmlStackTraceHelper.cpp b/qt/qml/QmlStackTraceHelper/QmlStackTraceHelper.cpp index a58c0f2..21410b3 100644 --- a/qt/qml/QmlStackTraceHelper/QmlStackTraceHelper.cpp +++ b/qt/qml/QmlStackTraceHelper/QmlStackTraceHelper.cpp @@ -14,6 +14,7 @@ #include #include #include +#include extern "C" char *qt_v4StackTrace(void *executionContext); @@ -37,7 +38,11 @@ void printQmlStackTraces() if (!context) continue; QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(context->engine()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) + QV4::ExecutionEngine *v4engine = enginePriv->v4Engine.get(); +#else QV4::ExecutionEngine *v4engine = enginePriv->v4engine(); +#endif qDebug() << "Stack trace for" << qw; qDebug().noquote() << qmlStackTrace(v4engine); qDebug() << "\n"; diff --git a/qt/qml/QmlStackTraceHelper/example/CMakeLists.txt b/qt/qml/QmlStackTraceHelper/example/CMakeLists.txt index 07abb7a..73f4d2e 100644 --- a/qt/qml/QmlStackTraceHelper/example/CMakeLists.txt +++ b/qt/qml/QmlStackTraceHelper/example/CMakeLists.txt @@ -15,6 +15,10 @@ find_package( Quick ) +if (Qt6Qml_VERSION VERSION_GREATER_EQUAL "6.10.0") + find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED QmlPrivate) +endif() + set(example_tmp_4_SOURCES ../QmlStackTraceHelper.cpp main.cpp) set(example_tmp_4_QRCS qrc.qrc)