1 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h
index be9f632557..39f0a6d1bb 100644
--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -40,13 +40,11 @@
 #ifndef QTCORE_RESULTSTORE_H
 #define QTCORE_RESULTSTORE_H
 
-#include <QtCore/qglobal.h>
-
-#ifndef QT_NO_QFUTURE
-
 #include <QtCore/qmap.h>
 #include <QtCore/qdebug.h>
 
+QT_REQUIRE_CONFIG(future);
+
 QT_BEGIN_NAMESPACE
 
 
@@ -67,8 +65,8 @@ class ResultItem
 public:
     ResultItem(const void *_result, int _count) : m_count(_count), result(_result) { } // contruct with vector of results
     ResultItem(const void *_result) : m_count(0), result(_result) { } // construct with result
-    ResultItem() : m_count(0), result(Q_NULLPTR) { }
-    bool isValid() const { return result != Q_NULLPTR; }
+    ResultItem() : m_count(0), result(nullptr) { }
+    bool isValid() const { return result != nullptr; }
     bool isVector() const { return m_count != 0; }
     int count() const { return (m_count == 0) ?  1 : m_count; }
     int m_count;          // result is either a pointer to a result or to a vector of results,
@@ -196,10 +194,10 @@ public:
 
 } // namespace QtPrivate
 
+Q_DECLARE_TYPEINFO(QtPrivate::ResultItem, Q_PRIMITIVE_TYPE);
+
 #endif //Q_QDOC
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_QFUTURE
-
 #endif