diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/core/resources/qcircularbuffer_p.h | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/resources/qcircularbuffer_p.h')
| -rw-r--r-- | src/core/resources/qcircularbuffer_p.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h index 08665f4b5..e10b7236d 100644 --- a/src/core/resources/qcircularbuffer_p.h +++ b/src/core/resources/qcircularbuffer_p.h @@ -51,21 +51,23 @@ // We mean it. // +#include <Qt3DCore/qt3dcore_global.h> +#include <QtCore/QtGlobal> #include <QtCore/qlist.h> #include <QtCore/qpair.h> #include <QtCore/qshareddata.h> #include <QtCore/qvector.h> #include <algorithm> -#ifdef Q_COMPILER_INITIALIZER_LISTS -# include <initializer_list> -#endif #include <iterator> #include <limits> #include <memory> #include <new> -#include <QtGlobal> -#include <Qt3DCore/qt3dcore_global.h> + + +#ifdef Q_COMPILER_INITIALIZER_LISTS +# include <initializer_list> +#endif QT_BEGIN_NAMESPACE |