From 5e921a18b2a098f68dbce368f9d20447939b3510 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 25 Nov 2016 11:16:45 +0100 Subject: Doc: Enable global linking to new Qt Creator VCS subtopics Each supported version control system is described in more detail in a dedicated topic since version 4.2. Change-Id: I666f8c18d31954935c836509e572a3bfd2c2a32e Reviewed-by: Venugopal Shivashankar --- doc/global/externalsites/qtcreator.qdoc | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'doc') diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index f73b17c92f..0e66610d84 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -81,6 +81,34 @@ \externalpage http://doc.qt.io/qtcreator/creator-version-control.html \title Qt Creator: Using Version Control Systems */ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-bazaar.html + \title Qt Creator: Using Bazaar +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-clearcase.html + \title Qt Creator: Using ClearCase +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-cvs.html + \title Qt Creator: Using CVS +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-git.html + \title Qt Creator: Using Git +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-mercurial.html + \title Qt Creator: Using Mercurial +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-perforce.html + \title Qt Creator: Using Perforce +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-vcs-subversion.html + \title Qt Creator: Using Subversion +*/ /*! \externalpage http://doc.qt.io/qtcreator/creator-keyboard-shortcuts.html \title Qt Creator: Keyboard Shortcuts -- cgit v1.2.3 From 1658bcb1047ab04d500683f94ecda74bf660d2af Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 2 Dec 2016 09:51:52 +0100 Subject: qdoc: Ignore Q_ALWAYS_INLINE and QT_HAS_INCLUDE() Number of API changes in Qt 5.8 use these macros and QDoc needs to ignore them the correctly match the documentation to the function signatures. Task-number: QTBUG-57424 Change-Id: I0c3a0eb4deb2d9b348f24800591bc6f6b47cf458 Reviewed-by: Martin Smith Reviewed-by: Marc Mutz --- doc/global/qt-cpp-defines.qdocconf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index fe8b7fb87e..4aa9111853 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -20,6 +20,7 @@ defines += Q_QDOC \ Cpp.ignoretokens += \ ENGINIOCLIENT_EXPORT \ PHONON_EXPORT \ + Q_ALWAYS_INLINE \ Q_AUTOTEST_EXPORT \ Q_BLUETOOTH_EXPORT \ Q_COMPAT_EXPORT \ @@ -150,6 +151,7 @@ Cpp.ignoredirectives += \ Q_ENUMS \ Q_FLAG \ Q_FLAGS \ + QT_HAS_INCLUDE \ Q_INTERFACES \ Q_PRIVATE_PROPERTY \ QT_FORWARD_DECLARE_CLASS \ -- cgit v1.2.3 From 9cc3c8983e7f35dc52869cf44d566c752540f1fd Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Thu, 8 Dec 2016 17:43:02 +0100 Subject: Doc: Update the highlighted examples list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed a few from the list after testing them on a Linux desktop and an Android device. Change-Id: If1b9e7739d8c374acc8cbd2c72d7176fdff2e9f3 Reviewed-by: Topi Reiniö Reviewed-by: Leena Miettinen --- doc/global/manifest-meta.qdocconf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 7ebe86a431..865a457581 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -33,7 +33,6 @@ manifestmeta.filters = highlighted android thumbnail ios manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtQuick/Qt Quick Demo - Photo Surface" \ "QtQuick/Qt Quick Demo - Tweet Search" \ - "QtQuick/Qt Quick Demo - Maroon*" \ "QtQuick/Qt Quick Demo - Calqlatr" \ "QtQuick/Qt Quick Demo - StocQt" \ "QtQuick/Qt Quick Demo - Clocks" \ @@ -45,14 +44,12 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtQuickDialogs/Qt Quick System Dialog Examples" \ "QtWinExtras/Quick Player" \ "QtMultimedia/QML Video Shader Effects Example" \ - "QtCanvas3D/Planets Example" \ "QtCanvas3D/Interactive Mobile Phone Example" \ "QtLocation/Map Viewer (QML)" manifestmeta.highlighted.attributes = isHighlighted:true -manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ - "QtQuick/Qt Quick Demo - Calqlatr" \ +manifestmeta.android.names = "QtQuick/Qt Quick Demo - Calqlatr" \ "QtWidgets/Application Chooser Example" \ "QtWidgets/Stickman Example" \ "QtWidgets/Move Blocks Example" \ -- cgit v1.2.3 From b8fab7c9f5debec9e26816b6b9581de921f90ef6 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 14 Dec 2016 15:37:52 +0200 Subject: Add Q_[ENUM|FLAG]_NS to global qt-cpp-defines doc conf We need to add Q_[ENUM|FLAG]_NS to global qt-cpp-defines doc conf otherwise qdoc ignores them and it will not produce any documentation or links to these enums/flags Task-number: QTBUG-57616 Change-Id: I744317346feb41db02787677f8698c4de15db226 Reviewed-by: Martin Smith --- doc/global/qt-cpp-defines.qdocconf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index fe8b7fb87e..5ebb208bcc 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -148,8 +148,10 @@ Cpp.ignoredirectives += \ Q_DUMMY_COMPARISON_OPERATOR \ Q_ENUM \ Q_ENUMS \ + Q_ENUM_NS \ Q_FLAG \ Q_FLAGS \ + Q_FLAG_NS \ Q_INTERFACES \ Q_PRIVATE_PROPERTY \ QT_FORWARD_DECLARE_CLASS \ -- cgit v1.2.3 From 6b79e18f172c6ffc8811fc4b60ebe54fdfb999f1 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 14 Dec 2016 12:57:28 +0100 Subject: qdoc: Ignore macro QT_WARNING_DISABLE_DEPRECATED This macro, introduced in Qt 5.8, needs to be ignored by QDoc in order to generate documentation correctly for a number of deprecated functions. Change-Id: I50bcd42167e3fafb7dda88484fde86e1aebb5980 Reviewed-by: Martin Smith --- doc/global/qt-cpp-defines.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 4aa9111853..73bd8559d0 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -122,6 +122,7 @@ Cpp.ignoretokens += \ QT_END_NAMESPACE \ QT_FASTCALL \ QT_MUTEX_LOCK_NOEXCEPT \ + QT_WARNING_DISABLE_DEPRECATED \ QT_WARNING_PUSH \ QT_WARNING_POP \ QT_WIDGET_PLUGIN_EXPORT \ -- cgit v1.2.3 From cfbe5df48cb782294ea47ecf6c598707df8e0b69 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 14 Dec 2016 14:24:08 +0100 Subject: qdoc: Define Q_COMPILER_UNICODE_STRINGS Some public functions in QString and QDebug are declared inside Q_COMPILER_UNICODE_STRINGS. This commit defines it for QDoc, and adds documentation for QDebug functions that are now visible to QDoc. Change-Id: Ia7f2501c1dc7b8244dcc3ce4adcd2019fdbffcb6 Reviewed-by: Martin Smith Reviewed-by: Thiago Macieira --- doc/global/qt-cpp-defines.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 73bd8559d0..f807241584 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -14,6 +14,7 @@ defines += Q_QDOC \ Q_NO_USING_KEYWORD \ __cplusplus \ Q_COMPILER_INITIALIZER_LISTS \ + Q_COMPILER_UNICODE_STRINGS \ Q_COMPILER_UNIFORM_INIT \ Q_COMPILER_RVALUE_REFS -- cgit v1.2.3