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/corelib | |
| 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/corelib')
4 files changed, 4 insertions, 0 deletions
diff --git a/examples/corelib/ipc/sharedmemory/sharedmemory.pro b/examples/corelib/ipc/sharedmemory/sharedmemory.pro index c1b634732e..f236fbce33 100644 --- a/examples/corelib/ipc/sharedmemory/sharedmemory.pro +++ b/examples/corelib/ipc/sharedmemory/sharedmemory.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) SOURCES += main.cpp \ dialog.cpp diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro b/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro index 806e9cbd14..5f0dd79963 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro +++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro @@ -1,5 +1,6 @@ TEMPLATE = app QT += widgets +requires(qtConfig(treeview)) CONFIG -= app_bundle CONFIG += c++11 diff --git a/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro b/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro index 8b91fb9ac7..95a7a81526 100644 --- a/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro +++ b/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro @@ -6,6 +6,7 @@ SOURCES = main.cpp \ renderthread.cpp \ window.cpp QT += widgets +requires(qtConfig(filedialog)) # install target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/queuedcustomtype diff --git a/examples/corelib/tools/contiguouscache/contiguouscache.pro b/examples/corelib/tools/contiguouscache/contiguouscache.pro index fb2267fc64..304581356a 100644 --- a/examples/corelib/tools/contiguouscache/contiguouscache.pro +++ b/examples/corelib/tools/contiguouscache/contiguouscache.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(listview)) HEADERS = randomlistmodel.h SOURCES = randomlistmodel.cpp \ |