Merge pull request #10 from Kolcha/master

removed warning for wide range of GCC versions (5,6,7), fixes #9
This commit is contained in:
Felix Barz
2017-11-08 12:28:41 +01:00
committed by GitHub
+2 -3
View File
@@ -172,8 +172,6 @@ QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler()
int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error) int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error)
{ {
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough")
switch (error->error_code) { switch (error->error_code) {
case BadAccess: case BadAccess:
case BadValue: case BadValue:
@@ -184,8 +182,9 @@ QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough")
errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code);
return 1; return 1;
} }
Q_FALLTHROUGH();
// fall through
default: default:
return 0; return 0;
} }
QT_WARNING_POP
} }