Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions qt/model_view/sortProxyModel/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 5 additions & 0 deletions qt/qml/QmlStackTraceHelper/QmlStackTraceHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <QString>
#include <QVector>
#include <QtQml/private/qqmlengine_p.h>
#include <QtQml/private/qv4stackframe_p.h>

extern "C" char *qt_v4StackTrace(void *executionContext);

Expand All @@ -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";
Expand Down
4 changes: 4 additions & 0 deletions qt/qml/QmlStackTraceHelper/example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down