summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.h20
-rw-r--r--src/tools/moc/generator.cpp2
2 files changed, 1 insertions, 21 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 140a9562c0..cd568df213 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -67,15 +67,6 @@
#include <QtCore/qtcore-config.h>
#endif
-// The QT_SUPPORTS macro is deprecated. Don't use it in new code.
-// Instead, use QT_CONFIG(feature)
-// ### Qt6: remove macro
-#ifdef _MSC_VER
-# define QT_SUPPORTS(FEATURE) (!defined QT_NO_##FEATURE)
-#else
-# define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))
-#endif
-
/*
The QT_CONFIG macro implements a safe compile time check for features of Qt.
Features can be in three states:
@@ -210,10 +201,6 @@ namespace QT_NAMESPACE {}
#endif /* __cplusplus */
-// ### Qt6: remove me.
-#define QT_BEGIN_HEADER
-#define QT_END_HEADER
-
#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
@@ -580,13 +567,6 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed;
# define Q_ALWAYS_INLINE inline
#endif
-#if defined(Q_CC_GNU) && defined(Q_OS_WIN) && !defined(QT_NO_DATA_RELOCATION)
-// ### Qt6: you can remove me
-# define QT_INIT_METAOBJECT __attribute__((init_priority(101)))
-#else
-# define QT_INIT_METAOBJECT
-#endif
-
//defines the type for the WNDPROC on windows
//the alignment needs to be forced for sse2 to not crash with mingw
#if defined(Q_OS_WIN)
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 06b2ffc06f..b09e567b59 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -537,7 +537,7 @@ void Generator::generateCode()
//
// Finally create and initialize the static meta object
//
- fprintf(out, "QT_INIT_METAOBJECT const QMetaObject %s::staticMetaObject = { {\n", cdef->qualified.constData());
+ fprintf(out, "const QMetaObject %s::staticMetaObject = { {\n", cdef->qualified.constData());
if (isQObject)
fprintf(out, " nullptr,\n");