Remove QPromiseError; fix include order to compile on GCC 9 (#45)

Co-authored-by: Ryan Henderson <the.unkle.george@gmail.com>
This commit is contained in:
Dmitriy Purgin 2021-03-20 09:25:41 +01:00 committed by GitHub
parent bac405febf
commit 461f09bef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions

View File

@ -8,8 +8,8 @@
#ifndef QTPROMISE_QPROMISE_H #ifndef QTPROMISE_QPROMISE_H
#define QTPROMISE_QPROMISE_H #define QTPROMISE_QPROMISE_H
#include "qpromise_p.h"
#include "qpromiseexceptions.h" #include "qpromiseexceptions.h"
#include "qpromise_p.h"
#include "qpromiseglobal.h" #include "qpromiseglobal.h"
#include "qpromiseresolver.h" #include "qpromiseresolver.h"

View File

@ -8,7 +8,6 @@
#ifndef QTPROMISE_QPROMISEEXCEPTIONS_H #ifndef QTPROMISE_QPROMISEEXCEPTIONS_H
#define QTPROMISE_QPROMISEEXCEPTIONS_H #define QTPROMISE_QPROMISEEXCEPTIONS_H
#include "qpromise_p.h"
#include "qpromiseglobal.h" #include "qpromiseglobal.h"
#include <QtCore/QException> #include <QtCore/QException>
@ -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 } // namespace QtPromise
#endif // QTPROMISE_QPROMISEEXCEPTIONS_H #endif // QTPROMISE_QPROMISEEXCEPTIONS_H