mirror of
https://github.com/simonbrunel/qtpromise.git
synced 2024-11-24 11:40:41 +08:00
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:
parent
bac405febf
commit
461f09bef8
@ -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"
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user