diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /src/network/kernel/qhostinfo_p.h | |
parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
Diffstat (limited to 'src/network/kernel/qhostinfo_p.h')
-rw-r--r-- | src/network/kernel/qhostinfo_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 82cf34719f..8cce302166 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -61,7 +61,9 @@ #include "QtCore/qobject.h" #include "QtCore/qpointer.h" #include "QtCore/qthread.h" +#if QT_CONFIG(thread) #include "QtCore/qthreadpool.h" +#endif #include "QtCore/qrunnable.h" #include "QtCore/qlist.h" #include "QtCore/qqueue.h" @@ -238,20 +240,25 @@ public: friend class QHostInfoRunnable; protected: +#if QT_CONFIG(thread) QList<QHostInfoRunnable*> currentLookups; // in progress QList<QHostInfoRunnable*> postponedLookups; // postponed because in progress for same host +#endif QQueue<QHostInfoRunnable*> scheduledLookups; // not yet started QList<QHostInfoRunnable*> finishedLookups; // recently finished QList<int> abortedLookups; // ids of aborted lookups +#if QT_CONFIG(thread) QThreadPool threadPool; - +#endif QMutex mutex; bool wasDeleted; private slots: +#if QT_CONFIG(thread) void waitForThreadPoolDone() { threadPool.waitForDone(); } +#endif }; QT_END_NAMESPACE |