2013-02-19 16:54:54 +00:00
|
|
|
versionsym = QT_VERSION_STR
|
|
|
|
|
|
|
|
defines += Q_QDOC \
|
|
|
|
QT_.*_SUPPORT \
|
|
|
|
QT_.*_LIB \
|
|
|
|
QT_COMPAT \
|
|
|
|
QT_KEYPAD_NAVIGATION \
|
|
|
|
QT_NO_EGL \
|
|
|
|
QT3_SUPPORT \
|
|
|
|
Q_WS_.* \
|
|
|
|
Q_OS_.* \
|
|
|
|
Q_BYTE_ORDER \
|
|
|
|
QT_DEPRECATED \
|
|
|
|
QT_DEPRECATED_* \
|
|
|
|
Q_NO_USING_KEYWORD \
|
|
|
|
__cplusplus \
|
2013-08-29 07:10:52 +00:00
|
|
|
Q_COMPILER_INITIALIZER_LISTS \
|
qcompilerdetection.h: add Q_COMPILER_UNIFORM_INIT
Up to now, the feature classe Uniform Initialization was subsumed by the
Q_COMPILER_INITIALIZER_LISTS flag together with support for
std::initializer_list.
This caused at least two problems:
1. On QNX, the standard libray does not ship <initializer_list>, even
though the compiler (a GCC 4.6, IIRC) supports it. But since there
was only one Q_COMPILER flag for both, support for the compiler-only
part of the feature had to be disabled, too.
2. MSVC 2013 supports initializer lists, but has a bug that renders full
uniform initialization support, as required for QUuid, useless.
By splitting the feature into two, we can separate them better, and do
so in QUuid, which is the only class that currently takes advantage of
uniform initialization (to provide constexpr constructors).
Since Q_COMPILER_INITIALIZER_LISTS worked as a flag for uniform
initialization so far, with the two known exceptions above,
UNIFORM_INIT is defined whenever INITIALIZER_LIST is, except that
I don't revert UNIFORM_INIT on QNX as I do for INITIALIZER_LISTS
and that I expect the MSVC 2013 features to set INITIALIZER_LIST,
but not UNIFORM_INIT.
Task-number: QTBUG-34705
Change-Id: I81916e950a0f3aab3de7977e0326d2de3d31b14c
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-12 10:17:05 +00:00
|
|
|
Q_COMPILER_UNIFORM_INIT \
|
2013-08-29 07:10:52 +00:00
|
|
|
Q_COMPILER_RVALUE_REFS
|
2013-02-19 16:54:54 +00:00
|
|
|
|
2012-10-26 12:27:25 +00:00
|
|
|
Cpp.ignoretokens += \
|
2014-04-14 12:12:00 +00:00
|
|
|
ENGINIOCLIENT_EXPORT \
|
2012-11-07 11:38:47 +00:00
|
|
|
PHONON_EXPORT \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_AUTOTEST_EXPORT \
|
|
|
|
Q_BLUETOOTH_EXPORT \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_COMPAT_EXPORT \
|
|
|
|
Q_CORE_EXPORT \
|
|
|
|
Q_CORE_EXPORT_INLINE \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_DBUS_EXPORT \
|
|
|
|
Q_DECL_CONSTEXPR \
|
2013-09-14 18:36:38 +00:00
|
|
|
Q_DECL_DEPRECATED \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_DECL_NOEXCEPT \
|
|
|
|
Q_DECL_NOTHROW \
|
2014-01-09 23:16:49 +00:00
|
|
|
Q_DECL_UNUSED \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_DECLARATIVE_EXPORT \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_EXPLICIT \
|
|
|
|
Q_EXPORT \
|
|
|
|
Q_EXPORT_CODECS_CN \
|
|
|
|
Q_EXPORT_CODECS_JP \
|
|
|
|
Q_EXPORT_CODECS_KR \
|
|
|
|
Q_EXPORT_PLUGIN \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_EXPORT_PLUGIN2 \
|
|
|
|
Q_GADGET \
|
2012-10-26 10:39:04 +00:00
|
|
|
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 \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_INVOKABLE \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_LOCATION_EXPORT \
|
2013-08-22 10:39:32 +00:00
|
|
|
Q_POSITIONING_EXPORT \
|
2012-11-07 11:53:07 +00:00
|
|
|
Q_MULTIMEDIA_EXPORT \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_NETWORK_EXPORT \
|
2013-08-09 20:35:09 +00:00
|
|
|
Q_NORETURN \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_OPENGL_EXPORT \
|
|
|
|
Q_OPENVG_EXPORT \
|
|
|
|
Q_OUTOFLINE_TEMPLATE \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_PRINTSUPPORT_EXPORT \
|
2013-04-03 11:25:26 +00:00
|
|
|
Q_QML_EXPORT \
|
2013-07-19 10:37:03 +00:00
|
|
|
Q_REQUIRED_RESULT \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_SCRIPT_EXPORT \
|
|
|
|
Q_SCRIPTTOOLS_EXPORT \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_SQL_EXPORT \
|
|
|
|
Q_SVG_EXPORT \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_TESTLIB_EXPORT \
|
2012-11-07 11:38:47 +00:00
|
|
|
Q_TYPENAME \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_WIDGETS_EXPORT \
|
2013-10-02 10:14:17 +00:00
|
|
|
Q_WINEXTRAS_EXPORT \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_XML_EXPORT \
|
|
|
|
Q_XMLPATTERNS_EXPORT \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_XMLSTREAM_EXPORT \
|
|
|
|
QAXFACTORY_EXPORT \
|
2012-10-26 10:39:04 +00:00
|
|
|
QDBUS_EXPORT \
|
2012-10-26 12:27:25 +00:00
|
|
|
QDESIGNER_COMPONENTS_LIBRARY \
|
|
|
|
QDESIGNER_EXTENSION_LIBRARY \
|
|
|
|
QDESIGNER_SDK_LIBRARY \
|
|
|
|
QDESIGNER_SHARED_LIBRARY \
|
|
|
|
QDESIGNER_UILIB_LIBRARY \
|
|
|
|
QHELP_EXPORT \
|
2012-11-07 11:38:47 +00:00
|
|
|
QM_AUTOTEST_EXPORT \
|
2012-10-26 12:27:25 +00:00
|
|
|
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 \
|
2012-10-26 10:39:04 +00:00
|
|
|
QT_BEGIN_INCLUDE_NAMESPACE \
|
2012-10-26 12:27:25 +00:00
|
|
|
QT_BEGIN_NAMESPACE \
|
|
|
|
QT_BOOTSTRAPPED \
|
|
|
|
QT_DESIGNER_STATIC \
|
2012-10-26 10:39:04 +00:00
|
|
|
QT_END_INCLUDE_NAMESPACE \
|
2012-10-26 12:27:25 +00:00
|
|
|
QT_END_NAMESPACE \
|
|
|
|
QT_FASTCALL \
|
2013-09-05 07:36:02 +00:00
|
|
|
QT_MUTEX_LOCK_NOEXCEPT \
|
2012-10-26 12:27:25 +00:00
|
|
|
QT_WIDGET_PLUGIN_EXPORT \
|
|
|
|
QWEBKIT_EXPORT
|
|
|
|
|
2013-02-19 16:54:54 +00:00
|
|
|
Cpp.ignoredirectives += \
|
2012-10-26 12:27:25 +00:00
|
|
|
__attribute__ \
|
|
|
|
K_DECLARE_PRIVATE \
|
2012-11-07 11:38:47 +00:00
|
|
|
PHONON_HEIR \
|
|
|
|
PHONON_OBJECT \
|
2012-11-07 11:53:07 +00:00
|
|
|
Q_CLASSINFO \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_DECLARE_INTERFACE \
|
|
|
|
Q_DECLARE_METATYPE \
|
|
|
|
Q_DECLARE_OPERATORS_FOR_FLAGS \
|
|
|
|
Q_DECLARE_PRIVATE \
|
2012-10-26 12:27:25 +00:00
|
|
|
Q_DECLARE_PRIVATE_D \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_DECLARE_PUBLIC \
|
|
|
|
Q_DECLARE_SHARED \
|
|
|
|
Q_DECLARE_TR_FUNCTIONS \
|
|
|
|
Q_DECLARE_TYPEINFO \
|
2014-03-17 11:55:44 +00:00
|
|
|
Q_DECL_NOEXCEPT_EXPR \
|
|
|
|
QT_DEPRECATED_X \
|
2012-10-26 10:39:04 +00:00
|
|
|
Q_DISABLE_COPY \
|
|
|
|
Q_DUMMY_COMPARISON_OPERATOR \
|
|
|
|
Q_ENUMS \
|
|
|
|
Q_FLAGS \
|
|
|
|
Q_INTERFACES \
|
|
|
|
Q_PRIVATE_PROPERTY \
|
2012-11-07 11:38:47 +00:00
|
|
|
QT_FORWARD_DECLARE_CLASS \
|
2013-03-19 15:13:24 +00:00
|
|
|
Q_DECLARE_HANDLE \
|
|
|
|
Q_REVISION
|