diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/gui/util/qshaderformat_p.h | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/gui/util/qshaderformat_p.h')
| -rw-r--r-- | src/gui/util/qshaderformat_p.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h index 064c2364a7..84bf71fdb6 100644 --- a/src/gui/util/qshaderformat_p.h +++ b/src/gui/util/qshaderformat_p.h @@ -69,22 +69,22 @@ public: OpenGLES }; - Q_GUI_EXPORT QShaderFormat() Q_DECL_NOTHROW; + Q_GUI_EXPORT QShaderFormat() noexcept; - Q_GUI_EXPORT Api api() const Q_DECL_NOTHROW; - Q_GUI_EXPORT void setApi(Api api) Q_DECL_NOTHROW; + Q_GUI_EXPORT Api api() const noexcept; + Q_GUI_EXPORT void setApi(Api api) noexcept; - Q_GUI_EXPORT QVersionNumber version() const Q_DECL_NOTHROW; - Q_GUI_EXPORT void setVersion(const QVersionNumber &version) Q_DECL_NOTHROW; + Q_GUI_EXPORT QVersionNumber version() const noexcept; + Q_GUI_EXPORT void setVersion(const QVersionNumber &version) noexcept; - Q_GUI_EXPORT QStringList extensions() const Q_DECL_NOTHROW; - Q_GUI_EXPORT void setExtensions(const QStringList &extensions) Q_DECL_NOTHROW; + Q_GUI_EXPORT QStringList extensions() const noexcept; + Q_GUI_EXPORT void setExtensions(const QStringList &extensions) noexcept; - Q_GUI_EXPORT QString vendor() const Q_DECL_NOTHROW; - Q_GUI_EXPORT void setVendor(const QString &vendor) Q_DECL_NOTHROW; + Q_GUI_EXPORT QString vendor() const noexcept; + Q_GUI_EXPORT void setVendor(const QString &vendor) noexcept; - Q_GUI_EXPORT bool isValid() const Q_DECL_NOTHROW; - Q_GUI_EXPORT bool supports(const QShaderFormat &other) const Q_DECL_NOTHROW; + Q_GUI_EXPORT bool isValid() const noexcept; + Q_GUI_EXPORT bool supports(const QShaderFormat &other) const noexcept; private: Api m_api; @@ -93,9 +93,9 @@ private: QString m_vendor; }; -Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW; +Q_GUI_EXPORT bool operator==(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept; -inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) Q_DECL_NOTHROW +inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexcept { return !(lhs == rhs); } |