From 9a76537aa4084e5ea3fb0ac81d9efa5dc84206ff Mon Sep 17 00:00:00 2001
From: Justin Clift <justin@postgresql.org>
Date: Fri, 13 Jul 2018 00:28:25 +0100
Subject: [PATCH] Fix Win compile failure

* Revert c861f1b9d957983cff1f1851d5b1e59392b98389, as it's breaking
  the MSVC 2013 compile.
* Move the new OUTPUT_NAME line slightly, so it's recognised
---
 CMakeLists.txt      | 2 +-
 src/sqltextedit.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc56dd68..92a1002b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ if (POLICY CMP0025)
 endif ()
 
 if(WIN32 AND MSVC)
-	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "DB Browser for SQLite")
 	if(CMAKE_CL_64)
 		# Paths for 64-bit windows builds
 		set(OPENSSL_PATH "C:/dev/OpenSSL-Win64")
@@ -399,6 +398,7 @@ else()
 endif()
 
 if(WIN32 AND MSVC)
+	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "DB Browser for SQLite")
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
 	set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp
index e10b7c46..6805820f 100644
--- a/src/sqltextedit.cpp
+++ b/src/sqltextedit.cpp
@@ -61,7 +61,6 @@ void SqlTextEdit::reloadSettings()
     case sqlb::GraveAccents:
         sqlLexer->setQuotedIdentifiers(true);
         // Fall through, treat quoted string as literal string
-        [[clang::fallthrough]];
     case sqlb::SquareBrackets:
         setupSyntaxHighlightingFormat(sqlLexer, "string", QsciLexerSQL::DoubleQuotedString);
         break;