summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 22f65a6aba..ec7de3b1c5 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -69,9 +69,7 @@
#ifdef __cplusplus
-#ifndef QT_NO_STL
#include <algorithm>
-#endif
#ifndef QT_NAMESPACE /* user namespace */
@@ -1183,14 +1181,8 @@ static inline bool qIsNull(float f)
template <typename T>
inline void qSwap(T &value1, T &value2)
{
-#ifdef QT_NO_STL
- const T t = value1;
- value1 = value2;
- value2 = t;
-#else
using std::swap;
swap(value1, value2);
-#endif
}
#if QT_DEPRECATED_SINCE(5, 0)