OSDN Git Service

build fix for the case when QT_NO_QFUTURE is defined
authorIvailo Monev <xakepa10@laimg.moc>
Fri, 26 Jul 2019 18:31:22 +0000 (18:31 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Fri, 26 Jul 2019 18:31:22 +0000 (18:31 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/core/concurrent/qfuturewatcher.cpp

index 74d9d5f..d1ee59c 100644 (file)
 #include "qfuturewatcher.h"
 
 #ifndef QT_NO_QFUTURE
-
-#include <QtCore/qcoreevent.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qthread.h>
-
-#include "qfuturewatcher_p.h"
+#  include <QtCore/qcoreevent.h>
+#  include <QtCore/qcoreapplication.h>
+#  include <QtCore/qthread.h>
+#  include "qfuturewatcher_p.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_QFUTURE
+
 /*! \class QFutureWatcher
     \reentrant
     \since 4.4
@@ -579,8 +580,6 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
 
 */
 
-QT_END_NAMESPACE
-
 #else
 
 // On Symbian winscw target QT_NO_QFUTURE and QT_NO_CONCURRENT are both defined.
@@ -598,4 +597,6 @@ void QFutureWatcherBase::disconnectNotify(const char *) { }
 
 #endif // QT_NO_QFUTURE
 
+QT_END_NAMESPACE
+
 #include "moc_qfuturewatcher.h"