diff options
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/benchmarks/qml/creation/tst_creation.cpp | 2 | ||||
-rw-r--r-- | tests/benchmarks/qml/painting/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/benchmarks/qml/painting/painting.pro | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt index 0cc44921f4..06cce61350 100644 --- a/tests/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt @@ -2,6 +2,6 @@ add_subdirectory(qml) add_subdirectory(quick) -if(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR (QT_FEATURE_opengl AND QT_FEATURE_private_tests)) +if(QT_FEATURE_private_tests AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(particles) endif() diff --git a/tests/benchmarks/qml/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp index ed2e52f869..2044360b3d 100644 --- a/tests/benchmarks/qml/creation/tst_creation.cpp +++ b/tests/benchmarks/qml/creation/tst_creation.cpp @@ -196,7 +196,7 @@ void tst_creation::qobject_10tree_cpp() void tst_creation::qobject_qmltype() { - QQmlType t = QQmlMetaType::qmlType("QtQuick/QtObject", 2, 0); + QQmlType t = QQmlMetaType::qmlType("QtQuick/QtObject", QTypeRevision::fromVersion(2, 0)); QBENCHMARK { QObject *obj = t.create(); diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt index 93ae5e9ef7..aa126450a6 100644 --- a/tests/benchmarks/qml/painting/CMakeLists.txt +++ b/tests/benchmarks/qml/painting/CMakeLists.txt @@ -10,6 +10,7 @@ qt_add_benchmark(painting PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL + Qt::OpenGLWidgets Qt::Widgets ) diff --git a/tests/benchmarks/qml/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro index 633be76e30..9948df511a 100644 --- a/tests/benchmarks/qml/painting/painting.pro +++ b/tests/benchmarks/qml/painting/painting.pro @@ -1,7 +1,7 @@ requires(qtHaveModule(opengl)) requires(qtHaveModule(widgets)) -QT += opengl widgets +QT += opengl widgets openglwidgets CONFIG += console macx:CONFIG -= app_bundle |