diff options
Diffstat (limited to 'src/corelib/tools/qlist.h')
| -rw-r--r-- | src/corelib/tools/qlist.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 9d70e55b1e..0d5b109f2f 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -46,12 +46,9 @@ #include <QtCore/qiterator.h> #include <QtCore/qrefcount.h> -#ifndef QT_NO_STL #include <iterator> #include <list> -#endif #ifdef Q_COMPILER_INITIALIZER_LISTS -#include <iterator> #include <initializer_list> #endif @@ -333,12 +330,10 @@ public: static QList<T> fromVector(const QVector<T> &vector); static QList<T> fromSet(const QSet<T> &set); -#ifndef QT_NO_STL static inline QList<T> fromStdList(const std::list<T> &list) { QList<T> tmp; qCopy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } inline std::list<T> toStdList() const { std::list<T> tmp; qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } -#endif private: Node *detach_helper_grow(int i, int n); |