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/network | |
| 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/network')
| -rw-r--r-- | examples/network/bearermonitor/bearermonitor.pro | 1 | ||||
| -rw-r--r-- | examples/network/fortuneclient/fortuneclient.pro | 1 | ||||
| -rw-r--r-- | examples/network/googlesuggest/googlesuggest.pro | 1 | ||||
| -rw-r--r-- | examples/network/network-chat/network-chat.pro | 1 | ||||
| -rw-r--r-- | examples/network/securesocketclient/securesocketclient.pro | 2 | ||||
| -rw-r--r-- | examples/network/torrent/torrent.pro | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index d75e021834..7d90b408e0 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -1,5 +1,6 @@ TARGET = bearermonitor QT = core gui network widgets +requires(qtConfig(treeview)) HEADERS = sessionwidget.h \ bearermonitor.h diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro index 8b376d9c53..6cf04a8b62 100644 --- a/examples/network/fortuneclient/fortuneclient.pro +++ b/examples/network/fortuneclient/fortuneclient.pro @@ -1,4 +1,5 @@ QT += network widgets +requires(qtConfig(combobox)) HEADERS = client.h SOURCES = client.cpp \ diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro index 84db77e30b..6e73906303 100644 --- a/examples/network/googlesuggest/googlesuggest.pro +++ b/examples/network/googlesuggest/googlesuggest.pro @@ -1,4 +1,5 @@ QT += network widgets +requires(qtConfig(itemviews)) SOURCES = main.cpp searchbox.cpp googlesuggest.cpp HEADERS = searchbox.h googlesuggest.h diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro index 3d525c96cc..2e3cbbc489 100644 --- a/examples/network/network-chat/network-chat.pro +++ b/examples/network/network-chat/network-chat.pro @@ -12,6 +12,7 @@ SOURCES = chatdialog.cpp \ FORMS = chatdialog.ui QT += network widgets requires(qtConfig(udpsocket)) +requires(qtConfig(listwidget)) # install target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro index 98d2041754..fb81ef6ed2 100644 --- a/examples/network/securesocketclient/securesocketclient.pro +++ b/examples/network/securesocketclient/securesocketclient.pro @@ -10,6 +10,8 @@ FORMS += certificateinfo.ui \ sslclient.ui \ sslerrors.ui QT += network widgets +requires(qtConfig(listwidget)) +requires(qtConfig(combobox)) # install target.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index 16a44d8aad..c640c3b5d0 100644 --- a/examples/network/torrent/torrent.pro +++ b/examples/network/torrent/torrent.pro @@ -1,4 +1,5 @@ QT += network widgets +requires(qtConfig(filedialog)) HEADERS += addtorrentdialog.h \ bencodeparser.h \ |