diff options
Diffstat (limited to 'src/corelib/global/qglobal_p.h')
| -rw-r--r-- | src/corelib/global/qglobal_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index 726e25b901..31f67510e3 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -18,7 +18,6 @@ #include "qglobal.h" #include "qglobal_p.h" // include self to avoid syncqt warning - no-op -#include <private/qtenvironmentvariables_p.h> // until qtdeclarative's tst_qqmlqt.cpp catches up #ifndef QT_BOOTSTRAPPED #include <QtCore/private/qconfig_p.h> @@ -55,10 +54,7 @@ #if defined(__cplusplus) QT_BEGIN_NAMESPACE -#if !defined(Q_CC_MSVC) || defined(Q_CC_CLANG) -Q_NORETURN -#endif -Q_CORE_EXPORT void qAbort(); +Q_NORETURN Q_CORE_EXPORT void qAbort(); QT_END_NAMESPACE |