summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2024-01-26 16:39:35 +0100
committerDominik Holland <dominik.holland@qt.io>2024-01-29 20:09:28 +0100
commitb9562efce074b8a5018745131df693c2a6bde83e (patch)
tree43725095eb9e86b6b7706bb26e0fd919bef6121c
parent0ca5598dbeade62022facbfbe07fef43efc2eefe (diff)
Axivion: Add file based and line based suppressions
Change-Id: I4e74f6ad324a4f86b097090546a7d7c516521f05 Pick-to: 6.7 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--coin/axivion/ci_config_linux.json40
-rw-r--r--src/interfaceframework/qifpendingreply.h1
-rw-r--r--src/interfaceframework/qifservicemanager.cpp2
-rw-r--r--src/interfaceframework/qifservicemanager.h1
-rw-r--r--src/interfaceframework/qifsimulationglobalobject.cpp2
5 files changed, 46 insertions, 0 deletions
diff --git a/coin/axivion/ci_config_linux.json b/coin/axivion/ci_config_linux.json
index 54fce0fd..dfcdd063 100644
--- a/coin/axivion/ci_config_linux.json
+++ b/coin/axivion/ci_config_linux.json
@@ -1,4 +1,44 @@
{
+ "Analysis": {
+ "EnableDisable": {
+ "_active": true
+ },
+ "EnableDisableSingleRule": {
+ "_active": true
+ },
+ "InitialExternalAnnotations": {
+ "_active": true,
+ "initial_comments": {
+ "$(delta:+)": {
+ "*/rep_*": [
+ "AXIVION Disable"
+ ],
+ "*/qifqueryparser_flex*": [
+ "AXIVION Disable"
+ ],
+ "build/include/*/*": [
+ "AXIVION Disable"
+ ],
+ "build/*/*-config*.h": [
+ "AXIVION Disable"
+ ],
+ "build/*/*_qmltyperegistrations.cpp": [
+ "AXIVION Disable"
+ ]
+ },
+ "$(delta:-)": []
+ }
+ },
+ "NextLine": {
+ "_active": true
+ },
+ "PreviousLine": {
+ "_active": true
+ },
+ "SameLine": {
+ "_active": true
+ }
+ },
"Project": {
"BuildSystemIntegration": {
"child_order": [
diff --git a/src/interfaceframework/qifpendingreply.h b/src/interfaceframework/qifpendingreply.h
index e5ddcaef..fed19031 100644
--- a/src/interfaceframework/qifpendingreply.h
+++ b/src/interfaceframework/qifpendingreply.h
@@ -21,6 +21,7 @@ class QIfPendingReplyWatcherPrivate;
Q_QTINTERFACEFRAMEWORK_EXPORT void qifRegisterPendingReplyBasicTypes();
+// AXIVION Next Line Qt-CtorMissingParentArgument: private ctor
class Q_QTINTERFACEFRAMEWORK_EXPORT QIfPendingReplyWatcher : public QObject
{
Q_OBJECT
diff --git a/src/interfaceframework/qifservicemanager.cpp b/src/interfaceframework/qifservicemanager.cpp
index a69daa68..aaa61152 100644
--- a/src/interfaceframework/qifservicemanager.cpp
+++ b/src/interfaceframework/qifservicemanager.cpp
@@ -27,6 +27,7 @@ QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcIfServiceManagement, "qt.if.servicemanagement");
namespace qtif_helper {
+// AXIVION DISABLE Qt-NonPodGlobalStatic
#ifdef QT_DEBUG
static const bool loadDebug = true;
#else
@@ -43,6 +44,7 @@ namespace qtif_helper {
#else
static const QString debugSuffixLiteral = u"_debug"_s;
#endif
+// AXIVION ENABLE Qt-NonPodGlobalStatic
QString backendBaseName(const QString &fileName)
{
diff --git a/src/interfaceframework/qifservicemanager.h b/src/interfaceframework/qifservicemanager.h
index cea53dbe..3587c37f 100644
--- a/src/interfaceframework/qifservicemanager.h
+++ b/src/interfaceframework/qifservicemanager.h
@@ -17,6 +17,7 @@ QT_BEGIN_NAMESPACE
class QIfServiceObject;
class QIfServiceManagerPrivate;
+// AXIVION Next Line Qt-CtorMissingParentArgument: private ctor
class Q_QTINTERFACEFRAMEWORK_EXPORT QIfServiceManager : public QAbstractListModel
{
Q_OBJECT
diff --git a/src/interfaceframework/qifsimulationglobalobject.cpp b/src/interfaceframework/qifsimulationglobalobject.cpp
index ef797728..e7f39d56 100644
--- a/src/interfaceframework/qifsimulationglobalobject.cpp
+++ b/src/interfaceframework/qifsimulationglobalobject.cpp
@@ -11,6 +11,7 @@ using namespace Qt::StringLiterals;
QT_BEGIN_NAMESPACE
+// AXIVION DISABLE Qt-NonPodGlobalStatic
namespace qtif_helper {
static const QString unsupportedLiteral = u"unsupported"_s;
static const QString minLiteral = u"minimum"_s;
@@ -18,6 +19,7 @@ namespace qtif_helper {
static const QString rangeLiteral = u"range"_s;
static const QString domainLiteral = u"domain"_s;
}
+// AXIVION ENABLE Qt-NonPodGlobalStatic
using namespace qtif_helper;