diff options
Diffstat (limited to 'tests/benchmarks/gui')
10 files changed, 10 insertions, 10 deletions
diff --git a/tests/benchmarks/gui/animation/animation.pro b/tests/benchmarks/gui/animation/animation.pro index 1c9a7c3c08..76c1a49e5c 100644 --- a/tests/benchmarks/gui/animation/animation.pro +++ b/tests/benchmarks/gui/animation/animation.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -!isEmpty(QT.widgets.name):SUBDIRS = qanimation +qtHaveModule(widgets): SUBDIRS = qanimation diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro index b0bc021b0a..a6ed4b84fb 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro @@ -1,7 +1,7 @@ TEMPLATE = app QT += svg testlib -contains(QT_CONFIG, opengl):QT += opengl +qtHaveModule(opengl): QT += opengl HEADERS += widgets/gvbwidget.h \ widgets/abstractscrollarea.h \ diff --git a/tests/benchmarks/gui/graphicsview/graphicsview.pro b/tests/benchmarks/gui/graphicsview/graphicsview.pro index f8ba062829..d89a00c4b9 100644 --- a/tests/benchmarks/gui/graphicsview/graphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/graphicsview.pro @@ -8,7 +8,7 @@ SUBDIRS = \ qgraphicsview \ qgraphicswidget -isEmpty(QT.widgets.name): SUBDIRS -= \ +!qtHaveModule(widgets): SUBDIRS -= \ qgraphicsanchorlayout \ qgraphicsitem \ qgraphicsscene \ diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro index 759216d46d..4047bad1ca 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro @@ -4,7 +4,7 @@ HEADERS += mainwindow.h view.h chip.h SOURCES += main.cpp SOURCES += mainwindow.cpp view.cpp chip.cpp -contains(QT_CONFIG, opengl):QT += opengl +qtHaveModule(opengl): QT += opengl build_all:!build_pass { CONFIG -= build_all diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri index 8d02504b73..105117de30 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri @@ -10,4 +10,4 @@ RESOURCES += \ chiptester/images.qrc QT += widgets -contains(QT_CONFIG, opengl) QT += opengl +qtHaveModule(opengl): QT += opengl diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro index f4b84f0428..e943347938 100644 --- a/tests/benchmarks/gui/gui.pro +++ b/tests/benchmarks/gui/gui.pro @@ -17,5 +17,5 @@ TRUSTED_BENCHMARKS += \ include(../trusted-benchmarks.pri) -isEmpty(QT.widgets.name): SUBDIRS -= \ +!qtHaveModule(widgets): SUBDIRS -= \ itemviews diff --git a/tests/benchmarks/gui/image/image.pro b/tests/benchmarks/gui/image/image.pro index fa26f3ec4c..2d5db35a73 100644 --- a/tests/benchmarks/gui/image/image.pro +++ b/tests/benchmarks/gui/image/image.pro @@ -6,5 +6,5 @@ SUBDIRS = \ qpixmap \ qpixmapcache -isEmpty(QT.widgets.name): SUBDIRS -= \ +!qtHaveModule(widgets): SUBDIRS -= \ qimagereader diff --git a/tests/benchmarks/gui/kernel/kernel.pro b/tests/benchmarks/gui/kernel/kernel.pro index 303eff9759..cd7235cff8 100644 --- a/tests/benchmarks/gui/kernel/kernel.pro +++ b/tests/benchmarks/gui/kernel/kernel.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -!isEmpty(QT.widgets.name):SUBDIRS = \ +qtHaveModule(widgets): SUBDIRS = \ qapplication \ qwidget diff --git a/tests/benchmarks/gui/painting/painting.pro b/tests/benchmarks/gui/painting/painting.pro index e55222a2c2..b3fb34757c 100644 --- a/tests/benchmarks/gui/painting/painting.pro +++ b/tests/benchmarks/gui/painting/painting.pro @@ -6,7 +6,7 @@ SUBDIRS = \ qtracebench \ qtbench -isEmpty(QT.widgets.name): SUBDIRS -= \ +!qtHaveModule(widgets): SUBDIRS -= \ qpainter \ qtracebench \ qtbench diff --git a/tests/benchmarks/gui/styles/styles.pro b/tests/benchmarks/gui/styles/styles.pro index 8930de127b..2c1d10b48c 100644 --- a/tests/benchmarks/gui/styles/styles.pro +++ b/tests/benchmarks/gui/styles/styles.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!isEmpty(QT.widgets.name):SUBDIRS = \ +qtHaveModule(widgets): SUBDIRS = \ qstylesheetstyle |