diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-30 15:54:06 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-30 15:13:57 +0000 |
| commit | a4586e52f2e027d9cd3810302569eec152bcfc54 (patch) | |
| tree | 02ea617bf448afbfa296257743a67e07c726c28e /src/app | |
| parent | c683b0274a026103f37ebb5bc57f12bb3f45cf36 (diff) | |
Use the [[noreturn]] attribute instead of Q_NORETURN
We can do this now that we require MSVC 2015.
Change-Id: I77be55435d4db6c6ff17afeff779e163cf3803fb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config-ui/commandlineparser.h | 4 | ||||
| -rw-r--r-- | src/app/qbs-setup-android/commandlineparser.h | 4 | ||||
| -rw-r--r-- | src/app/qbs-setup-qt/commandlineparser.h | 4 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/commandlineparser.h | 4 | ||||
| -rw-r--r-- | src/app/qbs/parser/parsercommand.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/app/config-ui/commandlineparser.h b/src/app/config-ui/commandlineparser.h index 1146f9893..1cb6bf2f7 100644 --- a/src/app/config-ui/commandlineparser.h +++ b/src/app/config-ui/commandlineparser.h @@ -52,9 +52,9 @@ public: QString usageString() const; private: - Q_NORETURN void throwError(const QString &message); + [[noreturn]] void throwError(const QString &message); void assignOptionArgument(const QString &option, QString &argument); - Q_NORETURN void complainAboutExtraArguments(); + [[noreturn]] void complainAboutExtraArguments(); bool m_helpRequested; QString m_settingsDir; diff --git a/src/app/qbs-setup-android/commandlineparser.h b/src/app/qbs-setup-android/commandlineparser.h index 4c477b06e..729f28cb9 100644 --- a/src/app/qbs-setup-android/commandlineparser.h +++ b/src/app/qbs-setup-android/commandlineparser.h @@ -59,9 +59,9 @@ public: QString usageString() const; private: - Q_NORETURN void throwError(const QString &message); + [[noreturn]] void throwError(const QString &message); void assignOptionArgument(const QString &option, QString &argument); - Q_NORETURN void complainAboutExtraArguments(); + [[noreturn]] void complainAboutExtraArguments(); bool m_helpRequested; QString m_sdkDir; diff --git a/src/app/qbs-setup-qt/commandlineparser.h b/src/app/qbs-setup-qt/commandlineparser.h index 5952061f8..8ac1ba44d 100644 --- a/src/app/qbs-setup-qt/commandlineparser.h +++ b/src/app/qbs-setup-qt/commandlineparser.h @@ -56,9 +56,9 @@ public: QString usageString() const; private: - Q_NORETURN void throwError(const QString &message); + [[noreturn]] void throwError(const QString &message); void assignOptionArgument(const QString &option, QString &argument); - Q_NORETURN void complainAboutExtraArguments(); + [[noreturn]] void complainAboutExtraArguments(); bool m_helpRequested; bool m_autoDetectionMode; diff --git a/src/app/qbs-setup-toolchains/commandlineparser.h b/src/app/qbs-setup-toolchains/commandlineparser.h index c2c501bb1..94a7a6283 100644 --- a/src/app/qbs-setup-toolchains/commandlineparser.h +++ b/src/app/qbs-setup-toolchains/commandlineparser.h @@ -57,9 +57,9 @@ public: QString usageString() const; private: - Q_NORETURN void throwError(const QString &message); + [[noreturn]] void throwError(const QString &message); void assignOptionArgument(const QString &option, QString &argument); - Q_NORETURN void complainAboutExtraArguments(); + [[noreturn]] void complainAboutExtraArguments(); bool m_helpRequested; bool m_autoDetectionMode; diff --git a/src/app/qbs/parser/parsercommand.h b/src/app/qbs/parser/parsercommand.h index d8ff27af3..4a9b12133 100644 --- a/src/app/qbs/parser/parsercommand.h +++ b/src/app/qbs/parser/parsercommand.h @@ -66,7 +66,7 @@ protected: void addAllToAdditionalArguments(QStringList &input); void addOneToAdditionalArguments(const QString &argument); QString supportedOptionsDescription() const; - Q_NORETURN void throwError(const QString &reason); + [[noreturn]] void throwError(const QString &reason); private: QList<CommandLineOption::Type> actualSupportedOptions() const; |