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/desktop | |
| 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/desktop')
| -rw-r--r-- | examples/widgets/desktop/screenshot/screenshot.pro | 1 | ||||
| -rw-r--r-- | examples/widgets/desktop/systray/systray.pro | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/examples/widgets/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro index d179833cbd..37108503de 100644 --- a/examples/widgets/desktop/screenshot/screenshot.pro +++ b/examples/widgets/desktop/screenshot/screenshot.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) HEADERS = screenshot.h SOURCES = main.cpp \ diff --git a/examples/widgets/desktop/systray/systray.pro b/examples/widgets/desktop/systray/systray.pro index 1d4fdc7843..e0708ea832 100644 --- a/examples/widgets/desktop/systray/systray.pro +++ b/examples/widgets/desktop/systray/systray.pro @@ -4,6 +4,7 @@ SOURCES = main.cpp \ RESOURCES = systray.qrc QT += widgets +requires(qtConfig(combobox)) # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray |