diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /examples/widgets/tutorials | |
parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'examples/widgets/tutorials')
12 files changed, 12 insertions, 1 deletions
diff --git a/examples/widgets/tutorials/addressbook/part6/part6.pro b/examples/widgets/tutorials/addressbook/part6/part6.pro index 02473e2bfe..6796f30a73 100644 --- a/examples/widgets/tutorials/addressbook/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook/part6/part6.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) SOURCES = addressbook.cpp \ finddialog.cpp \ diff --git a/examples/widgets/tutorials/addressbook/part7/part7.pro b/examples/widgets/tutorials/addressbook/part7/part7.pro index bab6a593d6..6a99799c67 100644 --- a/examples/widgets/tutorials/addressbook/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook/part7/part7.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) SOURCES = addressbook.cpp \ finddialog.cpp \ diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro index 032f220b83..12378f305a 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro @@ -1,5 +1,5 @@ - QT += widgets +requires(qtConfig(filedialog)) SOURCES = main.cpp # install diff --git a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro index 72a74bbbac..18cb65d1ec 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro +++ b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro @@ -3,6 +3,7 @@ TARGET = mv_readonly TEMPLATE = app QT += widgets +requires(qtConfig(tableview)) SOURCES += main.cpp \ mymodel.cpp diff --git a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro index 8bf556f73b..590db82c93 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro +++ b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro @@ -3,6 +3,7 @@ TARGET = mv_formatting TEMPLATE = app QT += widgets +requires(qtConfig(tableview)) SOURCES += main.cpp \ mymodel.cpp diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro index 24c790d3a1..1ac36808e7 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro +++ b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro @@ -3,6 +3,7 @@ TARGET = mv_changingmodel TEMPLATE = app QT += widgets +requires(qtConfig(tableview)) SOURCES += main.cpp \ mymodel.cpp diff --git a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro index 354c39319c..0aae599de0 100644 --- a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro +++ b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro @@ -3,6 +3,7 @@ TARGET = mv_headers TEMPLATE = app QT += widgets +requires(qtConfig(tableview)) SOURCES += main.cpp \ mymodel.cpp diff --git a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro index 957f6e701a..b8ac19e140 100644 --- a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro +++ b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro @@ -3,6 +3,7 @@ TARGET = mv_edit TEMPLATE = app QT += widgets +requires(qtConfig(tableview)) SOURCES += main.cpp \ mainwindow.cpp \ diff --git a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro index cbcd3eed5e..84190d0663 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro +++ b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro @@ -1,6 +1,7 @@ TARGET = mv_tree TEMPLATE = app QT += widgets +requires(qtConfig(treeview)) SOURCES += main.cpp \ mainwindow.cpp HEADERS += mainwindow.h diff --git a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro index 24065d39a7..78ddd8e409 100644 --- a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro +++ b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro @@ -1,6 +1,7 @@ TARGET = mv_selections TEMPLATE = app QT += widgets +requires(qtConfig(treeview)) SOURCES += main.cpp \ mainwindow.cpp HEADERS += mainwindow.h diff --git a/examples/widgets/tutorials/notepad/notepad.pro b/examples/widgets/tutorials/notepad/notepad.pro index 7369dbc991..a552dacf00 100644 --- a/examples/widgets/tutorials/notepad/notepad.pro +++ b/examples/widgets/tutorials/notepad/notepad.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = notepad QT += printsupport +requires(qtConfig(fontdialog)) SOURCES += \ main.cpp\ diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro index 33ee6e6cb0..d47fb15eef 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro +++ b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(tableview)) SOURCES = main.cpp |