6a35e77ef3
Commit c5db8fc74 changed all instances of Q_WS_FOO to have the prefix Q_DEAD_CODE_FROM_QT4 instead, to make it clearer when reading the code that the code in question was a left-over from Qt4, when we used Q_WS_ defines instead of Q_OS_ defines. This worked well for cases of #ifdef Q_DEAD_CODE_FROM_QT4, but less so for cases of #ifndef Q_DEAD_CODE_FROM_QT4, where the code was actually unconditionally included. To make this even clearer, the defines have been replaced by checks for 1 or 0, with a comment describing how the code used to look in Qt4. The use of constants in the check also makes it easier for editors to parse the condition and show visually that the code is defined out. Change-Id: I152070d87334df7259b417cd5e17d7b7950379b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
168 lines
7.3 KiB
Plaintext
168 lines
7.3 KiB
Plaintext
versionsym = QT_VERSION_STR
|
|
|
|
defines += Q_QDOC \
|
|
QT_.*_SUPPORT \
|
|
QT_.*_LIB \
|
|
QT_COMPAT \
|
|
QT_KEYPAD_NAVIGATION \
|
|
QT_NO_EGL \
|
|
QT3_SUPPORT \
|
|
Q_OS_.* \
|
|
Q_BYTE_ORDER \
|
|
QT_DEPRECATED \
|
|
QT_DEPRECATED_* \
|
|
Q_NO_USING_KEYWORD \
|
|
__cplusplus \
|
|
Q_COMPILER_INITIALIZER_LISTS \
|
|
Q_COMPILER_UNIFORM_INIT \
|
|
Q_COMPILER_RVALUE_REFS
|
|
|
|
Cpp.ignoretokens += \
|
|
ENGINIOCLIENT_EXPORT \
|
|
PHONON_EXPORT \
|
|
Q_AUTOTEST_EXPORT \
|
|
Q_BLUETOOTH_EXPORT \
|
|
Q_COMPAT_EXPORT \
|
|
Q_CORE_EXPORT \
|
|
Q_CORE_EXPORT_INLINE \
|
|
Q_DBUS_EXPORT \
|
|
Q_DECL_CONSTEXPR \
|
|
Q_DECL_RELAXED_CONSTEXPR \
|
|
Q_DECL_CONST_FUNCTION \
|
|
Q_DECL_DEPRECATED \
|
|
Q_DECL_NOEXCEPT \
|
|
Q_DECL_FINAL \
|
|
Q_DECL_OVERRIDE \
|
|
Q_DECL_NOTHROW \
|
|
Q_DECL_PURE_FUNCTION \
|
|
Q_DECL_UNUSED \
|
|
Q_DECL_CF_RETURNS_RETAINED \
|
|
Q_DECL_NS_RETURNS_AUTORELEASED \
|
|
Q_DECL_EQ_DEFAULT \
|
|
Q_DECLARATIVE_EXPORT \
|
|
Q_EXPLICIT \
|
|
Q_EXPORT \
|
|
Q_EXPORT_CODECS_CN \
|
|
Q_EXPORT_CODECS_JP \
|
|
Q_EXPORT_CODECS_KR \
|
|
Q_EXPORT_PLUGIN \
|
|
Q_EXPORT_PLUGIN2 \
|
|
Q_GADGET \
|
|
Q_GFX_INLINE \
|
|
Q_GUI_EXPORT \
|
|
Q_GUI_EXPORT_INLINE \
|
|
Q_GUI_EXPORT_STYLE_CDE \
|
|
Q_GUI_EXPORT_STYLE_COMPACT \
|
|
Q_GUI_EXPORT_STYLE_MAC \
|
|
Q_GUI_EXPORT_STYLE_MOTIF \
|
|
Q_GUI_EXPORT_STYLE_MOTIFPLUS \
|
|
Q_GUI_EXPORT_STYLE_PLATINUM \
|
|
Q_GUI_EXPORT_STYLE_POCKETPC \
|
|
Q_GUI_EXPORT_STYLE_SGI \
|
|
Q_GUI_EXPORT_STYLE_WINDOWS \
|
|
Q_GUI_EXPORT_STYLE_WINDOWSXP \
|
|
Q_INLINE_TEMPLATE \
|
|
Q_INTERNAL_WIN_NO_THROW \
|
|
Q_INVOKABLE \
|
|
Q_LOCATION_EXPORT \
|
|
Q_POSITIONING_EXPORT \
|
|
Q_MULTIMEDIA_EXPORT \
|
|
Q_NAMESPACE \
|
|
Q_NETWORK_EXPORT \
|
|
Q_NEVER_INLINE \
|
|
Q_NORETURN \
|
|
Q_OPENGL_EXPORT \
|
|
Q_OPENVG_EXPORT \
|
|
Q_OUTOFLINE_TEMPLATE \
|
|
Q_PRINTSUPPORT_EXPORT \
|
|
Q_QML_EXPORT \
|
|
Q_REQUIRED_RESULT \
|
|
Q_SCRIPT_EXPORT \
|
|
Q_SCRIPTTOOLS_EXPORT \
|
|
Q_SERIALBUS_EXPORT \
|
|
Q_SQL_EXPORT \
|
|
Q_SVG_EXPORT \
|
|
Q_TESTLIB_EXPORT \
|
|
Q_TYPENAME \
|
|
Q_WIDGETS_EXPORT \
|
|
Q_WINEXTRAS_EXPORT \
|
|
Q_XML_EXPORT \
|
|
Q_XMLPATTERNS_EXPORT \
|
|
Q_XMLSTREAM_EXPORT \
|
|
QAXFACTORY_EXPORT \
|
|
QDBUS_EXPORT \
|
|
QDESIGNER_COMPONENTS_LIBRARY \
|
|
QDESIGNER_EXTENSION_LIBRARY \
|
|
QDESIGNER_SDK_LIBRARY \
|
|
QDESIGNER_SHARED_LIBRARY \
|
|
QDESIGNER_UILIB_LIBRARY \
|
|
QHELP_EXPORT \
|
|
QM_AUTOTEST_EXPORT \
|
|
QM_EXPORT_CANVAS \
|
|
QM_EXPORT_DNS \
|
|
QM_EXPORT_DOM \
|
|
QM_EXPORT_FTP \
|
|
QM_EXPORT_HTTP \
|
|
QM_EXPORT_ICONVIEW \
|
|
QM_EXPORT_NETWORK \
|
|
QM_EXPORT_OPENGL \
|
|
QM_EXPORT_OPENVG \
|
|
QM_EXPORT_SQL \
|
|
QM_EXPORT_TABLE \
|
|
QM_EXPORT_WORKSPACE \
|
|
QM_EXPORT_XML \
|
|
QT_ASCII_CAST_WARN \
|
|
QT_ASCII_CAST_WARN_CONSTRUCTOR \
|
|
QT_BEGIN_INCLUDE_NAMESPACE \
|
|
QT_BEGIN_NAMESPACE \
|
|
QT_BOOTSTRAPPED \
|
|
QT_DESIGNER_STATIC \
|
|
QT_END_INCLUDE_NAMESPACE \
|
|
QT_END_NAMESPACE \
|
|
QT_FASTCALL \
|
|
QT_MUTEX_LOCK_NOEXCEPT \
|
|
QT_WARNING_PUSH \
|
|
QT_WARNING_POP \
|
|
QT_WIDGET_PLUGIN_EXPORT \
|
|
QWEBKIT_EXPORT
|
|
|
|
Cpp.ignoredirectives += \
|
|
__attribute__ \
|
|
K_DECLARE_PRIVATE \
|
|
PHONON_HEIR \
|
|
PHONON_OBJECT \
|
|
Q_CLASSINFO \
|
|
Q_DECLARE_INTERFACE \
|
|
Q_DECLARE_METATYPE \
|
|
Q_DECLARE_OPERATORS_FOR_FLAGS \
|
|
Q_DECLARE_PRIVATE \
|
|
Q_DECLARE_PRIVATE_D \
|
|
Q_DECLARE_PUBLIC \
|
|
Q_DECLARE_SHARED \
|
|
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 \
|
|
Q_DECLARE_TR_FUNCTIONS \
|
|
Q_DECLARE_TYPEINFO \
|
|
Q_DECL_NOEXCEPT_EXPR \
|
|
QT_DEPRECATED_X \
|
|
Q_DISABLE_COPY \
|
|
Q_DUMMY_COMPARISON_OPERATOR \
|
|
Q_ENUM \
|
|
Q_ENUMS \
|
|
Q_FLAG \
|
|
Q_FLAGS \
|
|
Q_INTERFACES \
|
|
Q_PRIVATE_PROPERTY \
|
|
QT_FORWARD_DECLARE_CLASS \
|
|
Q_DECLARE_HANDLE \
|
|
Q_REVISION \
|
|
QT_WARNING_DISABLE_CLANG \
|
|
QT_WARNING_DISABLE_GCC \
|
|
QT_WARNING_DISABLE_INTEL \
|
|
QT_WARNING_DISABLE_MSVC \
|
|
Q_ATTRIBUTE_FORMAT_PRINTF \
|
|
Q_MV_IOS
|
|
|
|
# Qt 6: Remove
|
|
falsehoods += \
|
|
"QT_VERSION >= QT_VERSION_CHECK\\(6,0,0\\)"
|