From 461f09bef8547d8696f909488afa31b399b9c78d Mon Sep 17 00:00:00 2001 From: Dmitriy Purgin Date: Sat, 20 Mar 2021 09:25:41 +0100 Subject: [PATCH] Remove QPromiseError; fix include order to compile on GCC 9 (#45) Co-authored-by: Ryan Henderson --- src/qtpromise/qpromise.h | 2 +- src/qtpromise/qpromiseexceptions.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qtpromise/qpromise.h b/src/qtpromise/qpromise.h index d24a111..1d8e0e3 100644 --- a/src/qtpromise/qpromise.h +++ b/src/qtpromise/qpromise.h @@ -8,8 +8,8 @@ #ifndef QTPROMISE_QPROMISE_H #define QTPROMISE_QPROMISE_H -#include "qpromise_p.h" #include "qpromiseexceptions.h" +#include "qpromise_p.h" #include "qpromiseglobal.h" #include "qpromiseresolver.h" diff --git a/src/qtpromise/qpromiseexceptions.h b/src/qtpromise/qpromiseexceptions.h index 64963bb..2b8f9cb 100644 --- a/src/qtpromise/qpromiseexceptions.h +++ b/src/qtpromise/qpromiseexceptions.h @@ -8,7 +8,6 @@ #ifndef QTPROMISE_QPROMISEEXCEPTIONS_H #define QTPROMISE_QPROMISEEXCEPTIONS_H -#include "qpromise_p.h" #include "qpromiseglobal.h" #include @@ -65,12 +64,6 @@ public: } }; -// QPromiseError is provided for backward compatibility and will be -// removed in the next major version: it wasn't intended to be used -// directly and thus should not be part of the public API. -// TODO Remove QPromiseError at version 1.0 -using QPromiseError = QtPromisePrivate::PromiseError; - } // namespace QtPromise #endif // QTPROMISE_QPROMISEEXCEPTIONS_H