From 59359f67828926c192247f1b041a0438d904c6b6 Mon Sep 17 00:00:00 2001
From: Andrei Golubev <andrei.golubev@qt.io>
Date: Thu, 15 Oct 2020 16:52:14 +0200
Subject: Remove redundant duplicate of EnableForNonVoid in QFutureWatcher

qfuturewatcher.h includes qfuture.h, which includes EnableForNonVoid
through qfuture_impl.h header. Thus, there is never a need to keep
the same alias in QFutureWatcher as it always can use one from QFuture

Change-Id: I293fd087aea1a21ef5bcfdf50cdefc176a9703d0
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 src/corelib/thread/qfuturewatcher.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h
index d2b8eeace1..4a630dfbe8 100644
--- a/src/corelib/thread/qfuturewatcher.h
+++ b/src/corelib/thread/qfuturewatcher.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -131,12 +131,6 @@ private:
     virtual QFutureInterfaceBase &futureInterface() = 0;
 };
 
-namespace QtPrivate {
-
-template<class T>
-using EnableForNonVoid = std::enable_if_t<!std::is_same_v<T, void>>;
-}
-
 template <typename T>
 class QFutureWatcher : public QFutureWatcherBase
 {
-- 
cgit v1.2.3