summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2023-05-09 13:07:36 +0200
committerMarco Bubke <marco.bubke@qt.io>2023-05-10 10:48:25 +0000
commit8129f886bcc50e91f55de15f751df183f0db822c (patch)
treeb022062d8fe7c1255420143101f8df7cf1a538ce
parentbd9f49f026b489e90d5dfe445b717db85025b8e8 (diff)
downloadqt-creator-8129f886bcc50e91f55de15f751df183f0db822c.tar.gz
QmlDesigner: Improve warning suppression
Can be removed with never compiler. Change-Id: I3196acfc82e3ab53f0f72dec3b543f27b9bbe2e1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/libs/sqlite/sqliteids.h7
-rw-r--r--src/plugins/qmldesigner/CMakeLists.txt3
2 files changed, 2 insertions, 8 deletions
diff --git a/src/libs/sqlite/sqliteids.h b/src/libs/sqlite/sqliteids.h
index 7613a2df46..e7a4f9fbae 100644
--- a/src/libs/sqlite/sqliteids.h
+++ b/src/libs/sqlite/sqliteids.h
@@ -51,17 +51,10 @@ public:
return first.id >= second.id;
}
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
constexpr friend InternalIntegerType operator-(BasicId first, BasicId second)
{
return first.id - second.id;
}
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
constexpr bool isValid() const { return id > 0; }
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 00b8bddfbd..be90de8ae2 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -8,7 +8,8 @@ if (APPLE)
set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner")
endif()
-
+add_compile_options("$<$<COMPILE_LANG_AND_ID:CXX,Clang>:-Wno-error=maybe-uninitialized>")
+add_compile_options("$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=maybe-uninitialized>")
add_qtc_library(QmlDesignerUtils STATIC
DEPENDS