diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 18:13:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-02 23:10:55 +0000 |
| commit | d775b1fcb3fc7bd41af37f5d0a4d999320b62364 (patch) | |
| tree | b4fe9a26c57520c87d2082abe0883d0ff21938da /src/corelib/tools/qlist.h | |
| parent | 78a7e54f8f5c4ca6ce1ee6b0ac82c42b21738ac5 (diff) | |
Remove handling of missing Q_COMPILER_INITIALIZER_LISTS
Change-Id: Id65b39c787235a051262544932e6717d076f1ea0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qlist.h')
| -rw-r--r-- | src/corelib/tools/qlist.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index b916dcfd24..27868f7313 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -48,12 +48,10 @@ #include <QtCore/qvector.h> #include <QtCore/qcontainertools_impl.h> -#include <iterator> -#include <list> #include <algorithm> -#ifdef Q_COMPILER_INITIALIZER_LISTS #include <initializer_list> -#endif +#include <iterator> +#include <list> #include <stdlib.h> #include <new> @@ -166,13 +164,10 @@ public: inline QList &operator=(QList<T> &&other) noexcept { QList moved(std::move(other)); swap(moved); return *this; } inline void swap(QList<T> &other) noexcept { qSwap(d, other.d); } -#ifdef Q_COMPILER_INITIALIZER_LISTS inline QList(std::initializer_list<T> args) : QList(args.begin(), args.end()) {} -#endif template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> QList(InputIterator first, InputIterator last); - bool operator==(const QList<T> &l) const; inline bool operator!=(const QList<T> &l) const { return !(*this == l); } |