diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:37:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:24 +0100 |
| commit | c844c1e5bde966c50a41d43c942b806d5c2f251e (patch) | |
| tree | 02edb1651786a653c0d1ab12cf17780eecbbda14 /examples | |
| parent | 146e375210f406e62fd952d150bc1bcd926d60cb (diff) | |
| parent | 175d864fbb96ed64cc609fe08df4b28668368040 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I03085b7c604cda9c4a173ca8f6dd34d522e59b16
Diffstat (limited to 'examples')
4 files changed, 4 insertions, 0 deletions
diff --git a/examples/charts/barmodelmapper/barmodelmapper.pro b/examples/charts/barmodelmapper/barmodelmapper.pro index 45a5e224..0ff60561 100644 --- a/examples/charts/barmodelmapper/barmodelmapper.pro +++ b/examples/charts/barmodelmapper/barmodelmapper.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(tableview)) HEADERS += \ customtablemodel.h \ diff --git a/examples/charts/chartthemes/chartthemes.pro b/examples/charts/chartthemes/chartthemes.pro index 193dc4e6..5def152f 100644 --- a/examples/charts/chartthemes/chartthemes.pro +++ b/examples/charts/chartthemes/chartthemes.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(combobox)) HEADERS += \ themewidget.h diff --git a/examples/charts/modeldata/modeldata.pro b/examples/charts/modeldata/modeldata.pro index 95d3d689..b71a9d66 100644 --- a/examples/charts/modeldata/modeldata.pro +++ b/examples/charts/modeldata/modeldata.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(tableview)) HEADERS += \ customtablemodel.h \ diff --git a/examples/charts/piechartcustomization/piechartcustomization.pro b/examples/charts/piechartcustomization/piechartcustomization.pro index 081e9105..8c3bf136 100644 --- a/examples/charts/piechartcustomization/piechartcustomization.pro +++ b/examples/charts/piechartcustomization/piechartcustomization.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(combobox)) HEADERS += \ brushtool.h \ |