1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow through on ### Qt6 comments in qglobal.h

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2020-07-20 16:59:55 +02:00
parent 5247af96e3
commit 2584998c66
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/global/qglobal.h
View File

@ -67,15 +67,6 @@
#include <QtCore/qtcore-config.h> #include <QtCore/qtcore-config.h>
#endif #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. The QT_CONFIG macro implements a safe compile time check for features of Qt.
Features can be in three states: Features can be in three states:
@ -210,10 +201,6 @@ namespace QT_NAMESPACE {}
#endif /* __cplusplus */ #endif /* __cplusplus */
// ### Qt6: remove me.
#define QT_BEGIN_HEADER
#define QT_END_HEADER
#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT) #if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64 # define QT_LARGEFILE_SUPPORT 64
#endif #endif
@ -580,13 +567,6 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed;
# define Q_ALWAYS_INLINE inline # define Q_ALWAYS_INLINE inline
#endif #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 //defines the type for the WNDPROC on windows
//the alignment needs to be forced for sse2 to not crash with mingw //the alignment needs to be forced for sse2 to not crash with mingw
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)

2
src/tools/moc/generator.cpp
View File

@ -537,7 +537,7 @@ void Generator::generateCode()
// //
// Finally create and initialize the static meta object // 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) if (isQObject)
fprintf(out, " nullptr,\n"); fprintf(out, " nullptr,\n");