diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 16:59:55 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-18 12:55:38 +0200 |
commit | 2584998c66f866770e0d4237828f119213aae663 (patch) | |
tree | 22c2482dfeb08ae468687a3555208325656156d6 | |
parent | 5247af96e3bdf2f28f6e18007fb7e3a7458e0103 (diff) |
Follow through on ### Qt6 comments in qglobal.h
Left the translation NOOP for later, pending advice on how to fix
QIODevice, which doesn't compile without them.
Task-number: QTBUG-85700
Change-Id: Icc423ecabb43714d98b5d9b0f9a96c5bb6ef1d78
Reviewed-by: Martin Storsjö <martin@martin.st>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/corelib/global/qglobal.h | 20 | ||||
-rw-r--r-- | src/tools/moc/generator.cpp | 2 |
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"); |