summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-12 13:05:51 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-12 13:05:51 +0100
commit3e1f2777b7af74148e0560a49888f2ad61df5c02 (patch)
tree110a773f1cfb1dad8d988718d6f83fbe6311eb56
parent8b0018cb1a4dea8e74de01427d79494a68d843c6 (diff)
parent4ceabb63a6db137809a08cab11d10b0b0df5d411 (diff)
Merge remote-tracking branch 'origin/5.10' into 5.11
-rw-r--r--examples/datavisualization/bars/bars.pro2
-rw-r--r--examples/datavisualization/custominput/custominput.pro1
-rw-r--r--examples/datavisualization/itemmodel/itemmodel.pro1
-rw-r--r--examples/datavisualization/scatter/scatter.pro2
-rw-r--r--examples/datavisualization/surface/surface.pro1
5 files changed, 7 insertions, 0 deletions
diff --git a/examples/datavisualization/bars/bars.pro b/examples/datavisualization/bars/bars.pro
index ffb8b0ba..148fc66e 100644
--- a/examples/datavisualization/bars/bars.pro
+++ b/examples/datavisualization/bars/bars.pro
@@ -10,6 +10,8 @@ SOURCES += main.cpp graphmodifier.cpp
HEADERS += graphmodifier.h
QT += widgets
+requires(qtConfig(fontcombobox))
+requires(qtConfig(combobox))
OTHER_FILES += doc/src/* \
doc/images/*
diff --git a/examples/datavisualization/custominput/custominput.pro b/examples/datavisualization/custominput/custominput.pro
index 0e11bfab..1fe1c57b 100644
--- a/examples/datavisualization/custominput/custominput.pro
+++ b/examples/datavisualization/custominput/custominput.pro
@@ -12,6 +12,7 @@ HEADERS += scatterdatamodifier.h \
custominputhandler.h
QT += widgets
+requires(qtConfig(combobox))
RESOURCES += custominput.qrc
diff --git a/examples/datavisualization/itemmodel/itemmodel.pro b/examples/datavisualization/itemmodel/itemmodel.pro
index 3249bb7b..60b36b98 100644
--- a/examples/datavisualization/itemmodel/itemmodel.pro
+++ b/examples/datavisualization/itemmodel/itemmodel.pro
@@ -9,6 +9,7 @@ android|ios|winrt {
SOURCES += main.cpp
QT += widgets
+requires(qtConfig(tablewidget))
OTHER_FILES += doc/src/* \
doc/images/*
diff --git a/examples/datavisualization/scatter/scatter.pro b/examples/datavisualization/scatter/scatter.pro
index 1e98d637..b9f29f9c 100644
--- a/examples/datavisualization/scatter/scatter.pro
+++ b/examples/datavisualization/scatter/scatter.pro
@@ -10,6 +10,8 @@ SOURCES += main.cpp scatterdatamodifier.cpp
HEADERS += scatterdatamodifier.h
QT += widgets
+requires(qtConfig(combobox))
+requires(qtConfig(fontcombobox))
OTHER_FILES += doc/src/* \
doc/images/*
diff --git a/examples/datavisualization/surface/surface.pro b/examples/datavisualization/surface/surface.pro
index 9daf2546..a49fa468 100644
--- a/examples/datavisualization/surface/surface.pro
+++ b/examples/datavisualization/surface/surface.pro
@@ -12,6 +12,7 @@ SOURCES += main.cpp \
HEADERS += surfacegraph.h
QT += widgets
+requires(qtConfig(combobox))
RESOURCES += surface.qrc