feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Clean up qobjectdefs.h

Browse Source 
* Remove unneeded #include that might lead to false diagnostics
* Fix typo

Change-Id: I38a3bbe07dbcb33f004c7b7a2a4ca4a90fb77350
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-03-28 12:44:16 +02:00
parent d44ed66a9f
commit e5610c6ae2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
View File

@@ -29,8 +29,6 @@
#ifndef WRAPPED_QOBJECT_DEFS_H #ifndef WRAPPED_QOBJECT_DEFS_H
#define WRAPPED_QOBJECT_DEFS_H #define WRAPPED_QOBJECT_DEFS_H
#include <utility>
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmacro-redefined" #pragma clang diagnostic ignored "-Wmacro-redefined"
#pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template" #pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template"
@@ -60,7 +58,7 @@
# define Q_SLOT __attribute__((annotate("qt_slot"))) # define Q_SLOT __attribute__((annotate("qt_slot")))
#endif #endif
// static_assert can be found as a class child but does not add extra AST nodes for copmpletion // static_assert can be found as a class child but does not add extra AST nodes for completion
#define Q_PROPERTY(arg) static_assert("Q_PROPERTY", #arg); #define Q_PROPERTY(arg) static_assert("Q_PROPERTY", #arg);
#pragma clang diagnostic pop #pragma clang diagnostic pop