Revert "Fix (wrong) GCC7 fallthrough warnings"

Declare throwError with noreturn instead.

This reverts commit 9030d940e089676d87a6854145733191e26fba60.

Change-Id: I11c7adfec53090e326c47c08d4978c120e2ca98b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

6 files changed, 7 insertions, 9 deletions

diff --git a/src/app/config-ui/commandlineparser.h b/src/app/config-ui/commandlineparser.h
index 5902f4065..1146f9893 100644
--- a/src/app/config-ui/commandlineparser.h
+++ b/src/app/config-ui/commandlineparser.h
@@ -52,9 +52,9 @@ public:
     QString usageString() const;
 
 private:
-    void throwError(const QString &message);
+    Q_NORETURN void throwError(const QString &message);
     void assignOptionArgument(const QString &option, QString &argument);
-    void complainAboutExtraArguments();
+    Q_NORETURN void complainAboutExtraArguments();
 
     bool m_helpRequested;
     QString m_settingsDir;
diff --git a/src/app/qbs-setup-qt/commandlineparser.cpp b/src/app/qbs-setup-qt/commandlineparser.cpp
index 817d4bd95..9a6a003f7 100644
--- a/src/app/qbs-setup-qt/commandlineparser.cpp
+++ b/src/app/qbs-setup-qt/commandlineparser.cpp
@@ -87,7 +87,6 @@ void CommandLineParser::parse(const QStringList &commandLine)
     case 0:
     case 1:
         throwError(Tr::tr("Not enough command-line arguments provided."));
-        break;
     case 2:
         m_qmakePath = m_commandLine.at(0);
         m_profileName = m_commandLine.at(1);
diff --git a/src/app/qbs-setup-qt/commandlineparser.h b/src/app/qbs-setup-qt/commandlineparser.h
index 4329136d6..5952061f8 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:
-    void throwError(const QString &message);
+    Q_NORETURN void throwError(const QString &message);
     void assignOptionArgument(const QString &option, QString &argument);
-    void complainAboutExtraArguments();
+    Q_NORETURN void complainAboutExtraArguments();
 
     bool m_helpRequested;
     bool m_autoDetectionMode;
diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp
index 629d44bbd..b1cbc9129 100644
--- a/src/app/qbs-setup-toolchains/commandlineparser.cpp
+++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp
@@ -91,7 +91,6 @@ void CommandLineParser::parse(const QStringList &commandLine)
     case 0:
     case 1:
         throwError(Tr::tr("Not enough command-line arguments provided."));
-        break;
     case 2:
         m_compilerPath = m_commandLine.at(0);
         m_profileName = m_commandLine.at(1);
diff --git a/src/app/qbs-setup-toolchains/commandlineparser.h b/src/app/qbs-setup-toolchains/commandlineparser.h
index 5737d318b..c2c501bb1 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:
-    void throwError(const QString &message);
+    Q_NORETURN void throwError(const QString &message);
     void assignOptionArgument(const QString &option, QString &argument);
-    void complainAboutExtraArguments();
+    Q_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 e72318b7f..151626429 100644
--- a/src/app/qbs/parser/parsercommand.h
+++ b/src/app/qbs/parser/parsercommand.h
@@ -65,7 +65,7 @@ protected:
     void addAllToAdditionalArguments(QStringList &input);
     void addOneToAdditionalArguments(const QString &argument);
     QString supportedOptionsDescription() const;
-    void throwError(const QString &reason);
+    Q_NORETURN void throwError(const QString &reason);
 
 private:
     QList<CommandLineOption::Type> actualSupportedOptions() const;