AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
954f0d9397
qt5base-lts/doc/global/qt-cpp-defines.qdocconf

156 lines
6.8 KiB
Plaintext
Raw Normal View History

Doc: Fixed QDoc's navigation mechanism. The HTML pages need to display minimal navigation such as a link to the module landing page or Qt 5's index.html. -new variables available in qdocconf files: navigation.landingpage navigation.homepage navigation.cppclassespage navigation.qmltypespage buildversion The navigation variables are for the new navigation bar. The buildversion variable is to insert documentation build information into the pages. Note about compatibility with Qt Creator docs: The HTML template files for Qt Creator is retained to keep Qt Creator compatible with 5.0.x and 5.1.x. Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
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 \
Make it more obvious that Q_WS_ is dead code, and should perhaps be ported We still have a bunch of Q_WS_ ifdefs in our code, which are easy to mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming the ifdefs we make it clear that the code in question is dead. In incremental follow-ups, we can then selectively either remove, or port, the pieces that are dead code. Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-02-02 17:49:18 +00:00
Q_DEAD_CODE_FROM_QT4_.* \
Doc: Fixed QDoc's navigation mechanism. The HTML pages need to display minimal navigation such as a link to the module landing page or Qt 5's index.html. -new variables available in qdocconf files: navigation.landingpage navigation.homepage navigation.cppclassespage navigation.qmltypespage buildversion The navigation variables are for the new navigation bar. The buildversion variable is to insert documentation build information into the pages. Note about compatibility with Qt Creator docs: The HTML template files for Qt Creator is retained to keep Qt Creator compatible with 5.0.x and 5.1.x. Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-19 16:54:54 +00:00
Q_OS_.* \
Q_BYTE_ORDER \
QT_DEPRECATED \
QT_DEPRECATED_* \
Q_NO_USING_KEYWORD \
__cplusplus \
qdoc: Enable support for rvalue references in function signatures qdoc interprets the double-ampersand in function parameters using rvalue references (e.g. 'Type &&other') incorrectly as a logical AND operator, resulting in a syntax error. This change works around the issue by treating '&' the same as '*', and defining Q_COMPILER_RVALUE_REFS for qdoc. Task-number: QTBUG-32675 Change-Id: I499611f16f22c33ff5b878da0cd59d67ddf53d72 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
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 \
qdoc: Enable support for rvalue references in function signatures qdoc interprets the double-ampersand in function parameters using rvalue references (e.g. 'Type &&other') incorrectly as a logical AND operator, resulting in a syntax error. This change works around the issue by treating '&' the same as '*', and defining Q_COMPILER_RVALUE_REFS for qdoc. Task-number: QTBUG-32675 Change-Id: I499611f16f22c33ff5b878da0cd59d67ddf53d72 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-08-29 07:10:52 +00:00
Q_COMPILER_RVALUE_REFS
Doc: Fixed QDoc's navigation mechanism. The HTML pages need to display minimal navigation such as a link to the module landing page or Qt 5's index.html. -new variables available in qdocconf files: navigation.landingpage navigation.homepage navigation.cppclassespage navigation.qmltypespage buildversion The navigation variables are for the new navigation bar. The buildversion variable is to insert documentation build information into the pages. Note about compatibility with Qt Creator docs: The HTML template files for Qt Creator is retained to keep Qt Creator compatible with 5.0.x and 5.1.x. Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-19 16:54:54 +00:00
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Cpp.ignoretokens += \
Doc: Adding Enginio's export macro to the list of excluded QDoc tokens. -helps the QDoc parser read C++ API when the macro is excluded. Task-number: QTBUG-33360 Change-Id: Ic7e86c0d1cec4a1960d20b1c92c4b60396eb3ea6 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-04-14 12:12:00 +00:00
ENGINIOCLIENT_EXPORT \
Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia. Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:38:47 +00:00
PHONON_EXPORT \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_AUTOTEST_EXPORT \
Q_BLUETOOTH_EXPORT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_COMPAT_EXPORT \
Q_CORE_EXPORT \
Q_CORE_EXPORT_INLINE \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_DBUS_EXPORT \
Q_DECL_CONSTEXPR \
Add Q_DECL_RELAXED_CONSTEXPR macro Expands to constexpr if C++14 relaxed constepxr are supported by the compiler [ChangeLog][QtCore] Added Q_DECL_RELAXED_CONSTEXPR for the corresponding C++14 feature Change-Id: Id6b56b3a17da2ff838c80795e528e1247dc13f63 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-08-23 16:26:01 +00:00
Q_DECL_RELAXED_CONSTEXPR \
Introduce Q_DECL_CONST_FUNCTION and Q_DECL_PURE_FUNCTION That expand to __attribute__((const)) and ((pure)). A "const" function is a function allowed to examine only its arguments, without modifying them. A "pure" function is also allowed to read memory. Currently working only on GCC/ICC/Clang, MSVC lacks these. Change-Id: Ie60a0847b193fb88e116f61611dc571296a3df1c Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-03-01 13:12:33 +00:00
Q_DECL_CONST_FUNCTION \
Make qdoc ignore the Q_DECL_DEPRECATED token Task-number: QTBUG-27829 Change-Id: Ic3d25cd7da2a2c1266dfa113b7138f4086215777 Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-09-14 18:36:38 +00:00
Q_DECL_DEPRECATED \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_DECL_NOEXCEPT \
qdoc: Links to Q_DECL_FINAL not created This update fixes part of QTBUG-37719. Q_DECL_FINAL is a macro that is documented, but links to the documentation for it were not created. The problem was that Q_DECL_FINAL is actually used in the Qt sources, but it was not listed in the Cpp.ignoretokens clause in the qdocconf file. This update just adds it to Cpp.ignoretokens. Task-number: QTBUG-37719 Change-Id: I62945df4976b21b67084e6de25e25bbc4c92f89f Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-04-08 12:09:12 +00:00
Q_DECL_FINAL \
qdoc: ignore Q_DECL_OVERRIDE Change-Id: Idf07753b6811c1ec8dba1ddd0fbb8036ce6723f2 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-11-22 10:47:46 +00:00
Q_DECL_OVERRIDE \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_DECL_NOTHROW \
Introduce Q_DECL_CONST_FUNCTION and Q_DECL_PURE_FUNCTION That expand to __attribute__((const)) and ((pure)). A "const" function is a function allowed to examine only its arguments, without modifying them. A "pure" function is also allowed to read memory. Currently working only on GCC/ICC/Clang, MSVC lacks these. Change-Id: Ie60a0847b193fb88e116f61611dc571296a3df1c Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-03-01 13:12:33 +00:00
Q_DECL_PURE_FUNCTION \
Ask qdoc not to parse Q_DECL_UNUSED We have it on function declarations and it gets a bit lost... Change-Id: I19ba2e760f3714c26e78c3d8fd2570af3dcd136e Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-01-09 23:16:49 +00:00
Q_DECL_UNUSED \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_DECLARATIVE_EXPORT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
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 \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_EXPORT_PLUGIN2 \
Q_GADGET \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
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 \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_INVOKABLE \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_LOCATION_EXPORT \
Add qdoc ignore tag for new QtPositioning API. Change-Id: If725ac4e523d56a8dc274f8d6b53c0c34064ca06 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-08-22 10:39:32 +00:00
Q_POSITIONING_EXPORT \
Doc: Placed missing '\' Change-Id: I311ea81e2cdd0069f2a93758c3cd38bc75ae0b54 Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:53:07 +00:00
Q_MULTIMEDIA_EXPORT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_NETWORK_EXPORT \
Doc: ignore "Q_NORETURN" in function signatures. Needed by the upcoming function Q_NORETURN void QCommandLineParser::showHelp(int exitCode) Change-Id: Ie8550d2d0eff9eb20e629eef4952fa2b0b10f873 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-08-09 20:35:09 +00:00
Q_NORETURN \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_OPENGL_EXPORT \
Q_OPENVG_EXPORT \
Q_OUTOFLINE_TEMPLATE \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_PRINTSUPPORT_EXPORT \
qdoc: Added missing CPP ignore token, Q_QML_EXPORT This token must be ignored by qdoc's hapless C++ parser. Task-number: QTBUG-29444 Change-Id: I02a0c5926a3fa6284648a632341e38614a237a30 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-04-03 11:25:26 +00:00
Q_QML_EXPORT \
doc: Added Q_REQUIRED_RESULT to ignored tokens This macro is apparently knew. It was unknown to qdoc. Now qdoc knows to ignore it. Task-number: QTBUG-32344 Change-Id: Id4455ad2329aeb2d2f8cacef99cdd1ff2a72321c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-07-19 10:37:03 +00:00
Q_REQUIRED_RESULT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_SCRIPT_EXPORT \
Q_SCRIPTTOOLS_EXPORT \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_SQL_EXPORT \
Q_SVG_EXPORT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_TESTLIB_EXPORT \
Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia. Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:38:47 +00:00
Q_TYPENAME \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_WIDGETS_EXPORT \
qdoc: ignore Q_WINEXTRAS_EXPORT This is required for functions in the QtWin namespace. Change-Id: I6c38c8ef262377050a75861435da381863340f33 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-10-02 10:14:17 +00:00
Q_WINEXTRAS_EXPORT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_XML_EXPORT \
Q_XMLPATTERNS_EXPORT \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_XMLSTREAM_EXPORT \
QAXFACTORY_EXPORT \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
QDBUS_EXPORT \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
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 \
Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia. Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:38:47 +00:00
QM_AUTOTEST_EXPORT \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
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 \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
QT_BEGIN_INCLUDE_NAMESPACE \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
QT_BEGIN_NAMESPACE \
QT_BOOTSTRAPPED \
QT_DESIGNER_STATIC \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
QT_END_INCLUDE_NAMESPACE \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
QT_END_NAMESPACE \
QT_FASTCALL \
qdoc: Ignore QT_MUTEX_LOCK_NOEXCEPT macros QT_MUTEX_LOCK_NOEXCEPT is defined as Q_DECL_NOTHROW on Linux, the latter being already ignored by qdoc. This change ignores also the former, clearing related documentation warnings. Change-Id: Iaeee7a851b4b6d3c2e3308c1b376406c11271807 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-09-05 07:36:02 +00:00
QT_MUTEX_LOCK_NOEXCEPT \
Use the new warning enabling/disabling macros in qtbase Change-Id: I91ff06644e8047c2ca483f9768b46c1372eb6171 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2014-10-31 05:44:13 +00:00
QT_WARNING_PUSH \
QT_WARNING_POP \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
QT_WIDGET_PLUGIN_EXPORT \
QWEBKIT_EXPORT
Doc: Fixed QDoc's navigation mechanism. The HTML pages need to display minimal navigation such as a link to the module landing page or Qt 5's index.html. -new variables available in qdocconf files: navigation.landingpage navigation.homepage navigation.cppclassespage navigation.qmltypespage buildversion The navigation variables are for the new navigation bar. The buildversion variable is to insert documentation build information into the pages. Note about compatibility with Qt Creator docs: The HTML template files for Qt Creator is retained to keep Qt Creator compatible with 5.0.x and 5.1.x. Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-19 16:54:54 +00:00
Cpp.ignoredirectives += \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
__attribute__ \
K_DECLARE_PRIVATE \
Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia. Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:38:47 +00:00
PHONON_HEIR \
PHONON_OBJECT \
Doc: Placed missing '\' Change-Id: I311ea81e2cdd0069f2a93758c3cd38bc75ae0b54 Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:53:07 +00:00
Q_CLASSINFO \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_DECLARE_INTERFACE \
Q_DECLARE_METATYPE \
Q_DECLARE_OPERATORS_FOR_FLAGS \
Q_DECLARE_PRIVATE \
Doc: Consolidated the QDoc variables. -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 12:27:25 +00:00
Q_DECLARE_PRIVATE_D \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_DECLARE_PUBLIC \
Q_DECLARE_SHARED \
Q_DECLARE_TR_FUNCTIONS \
Q_DECLARE_TYPEINFO \
Doc: ignore Q_DECL_NOEXCEPT_EXPR and QT_DEPRECATED_X This fixes most of the \fn-not-found errors in QtCore. Change-Id: I61a48646c6341cb3310bbb83f190a15e9225fd14 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-03-17 11:55:44 +00:00
Q_DECL_NOEXCEPT_EXPR \
QT_DEPRECATED_X \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_DISABLE_COPY \
Q_DUMMY_COMPARISON_OPERATOR \
qdoc: Let qdoc ignore Q_ENUM and Q_FLAG Q_ENUM and Q_FLAG were not listed in the Cpp.ignoredirectives variable in qt-cpp-defines.qdocconf. This never used to cause parsing errors in qdoc, but now it does. The cause for this change was not determined at the time of this fix, which is to add Q_ENUM and Q_FLAG to the ignore directives list. Change-Id: I717c9101f7706097869f23b53eeca8cb1a0fee0a Task-number: QTBUG-44510 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2015-02-18 13:03:11 +00:00
Q_ENUM \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_ENUMS \
qdoc: Let qdoc ignore Q_ENUM and Q_FLAG Q_ENUM and Q_FLAG were not listed in the Cpp.ignoredirectives variable in qt-cpp-defines.qdocconf. This never used to cause parsing errors in qdoc, but now it does. The cause for this change was not determined at the time of this fix, which is to add Q_ENUM and Q_FLAG to the ignore directives list. Change-Id: I717c9101f7706097869f23b53eeca8cb1a0fee0a Task-number: QTBUG-44510 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2015-02-18 13:03:11 +00:00
Q_FLAG \
Doc: Adding base macros and other QDoc definitions The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-10-26 10:39:04 +00:00
Q_FLAGS \
Q_INTERFACES \
Q_PRIVATE_PROPERTY \
Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia. Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 11:38:47 +00:00
QT_FORWARD_DECLARE_CLASS \
Doc: Added the Q_REVISION macro to the ignore list This should avoid QDoc warnings when the macro is used with the signals and slots. Task-number QTBUG-30105 Change-Id: I8d1b32854c15ff07e6ece7b326be38666ae29c3f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-03-19 15:13:24 +00:00
Q_DECLARE_HANDLE \
Use the new warning enabling/disabling macros in qtbase Change-Id: I91ff06644e8047c2ca483f9768b46c1372eb6171 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2014-10-31 05:44:13 +00:00
Q_REVISION \
QT_WARNING_DISABLE_CLANG \
QT_WARNING_DISABLE_GCC \
QT_WARNING_DISABLE_INTEL \
QT_WARNING_DISABLE_MSVC
Reference in New Issue Copy Permalink