diff options
Diffstat (limited to 'src/corelib/tools/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 04ab9e6e80..3c0db06589 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -47,10 +47,8 @@ #include <QtCore/qlist.h> #include <QtCore/qrefcount.h> -#ifndef QT_NO_STL #include <iterator> #include <vector> -#endif #include <stdlib.h> #include <string.h> #ifdef Q_COMPILER_INITIALIZER_LISTS @@ -308,12 +306,10 @@ public: static QVector<T> fromList(const QList<T> &list); -#ifndef QT_NO_STL static inline QVector<T> fromStdVector(const std::vector<T> &vector) { QVector<T> tmp; tmp.reserve(int(vector.size())); qCopy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; } inline std::vector<T> toStdVector() const { std::vector<T> tmp; tmp.reserve(size()); qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } -#endif private: friend class QRegion; // Optimization for QRegion::rects() |