summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2020-05-05 14:22:21 +0200
committerOrgad Shaneh <orgads@gmail.com>2020-05-27 06:12:44 +0000
commitd5bfa21dfc2f010269404952f8e5212ca9d69194 (patch)
treee49b28bd6fdfec87ba0e1b329dac1ecf226102d5
parent197ccb9bda21382a9d26625f34eca45981fdebd6 (diff)
downloadqt-creator-d5bfa21dfc2f010269404952f8e5212ca9d69194.tar.gz
remove variant.hpp error
So this can be used with a Qt 5.15 build outside of QtCreator. Change-Id: I691687bf661be21d9c28f13a52ff5df58bb7412a Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/libs/utils/variant.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libs/utils/variant.h b/src/libs/utils/variant.h
index 371b9312d3..baf0c27816 100644
--- a/src/libs/utils/variant.h
+++ b/src/libs/utils/variant.h
@@ -29,9 +29,7 @@
See std(::experimental)::variant.
*/
-// TODO: replace by #include <(experimental/)variant> depending on compiler and C++ version
#if __cplusplus >= 201703L
-#error Please delete variant.hpp and the #else section below, then remove this error
#include <variant>
namespace Utils {