summaryrefslogtreecommitdiffstats
path: root/doc/global
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-253-815/+797
|\ | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qpropertyanimation.cpp src/gui/image/qicon.cpp tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
| * doc: Update online navigation header to match http://doc.qt.io/Tor Arne Vestbø2018-10-171-51/+18
| | | | | | | | | | | | Change-Id: I8154abc8cf2bb5895a75c4e41ff06cb99e4fedc5 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * doc: Update online CSSTor Arne Vestbø2018-10-163-762/+775
| | | | | | | | | | | | | | | | Copied from the CSS served by http://doc.qt.io/ Change-Id: Id37447e0f6de4a08a2632df862ae36f73d284814 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * doc: Update online HTML header URLsTor Arne Vestbø2018-10-161-3/+5
| | | | | | | | | | | | Change-Id: I2109f1a3113a724bfb6bc5a03b4c7b2d67f7e48c Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-291-0/+5
|\| | | | | | | Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
| * Doc: Add a macro that expands to the Qt version (Major.Minor)Topi Reinio2018-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | Versioning of some QML modules follows the Qt major and minor version exactly. Add a documentation macro that expands to the short version string to help automate the QML plugin documentation. Task-number: QTBUG-67818 Change-Id: I45e7a2a1adfd6a82b828222e49b1d02b7c05897e Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Doc: Add a macro that returns the minor versionTopi Reinio2018-09-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a global QDoc macro \QtMinorVersion that expands into the minor version of Qt, or more specifically, the minor version contained in the QT_VER environment variable. The main use case for the new macro is to document the QML modules whose minor versions track the minor version of Qt: \qmlmodule QtQuick 2.\QtMinorVersion Task-number: QTBUG-67818 Change-Id: I2b4fcbb18de0f8f95718099309090017c237622f Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Doc: Add a define for online and offline documentation templatesTopi Reinio2018-09-062-0/+4
|/ | | | | | | | | | | | | | | | | The browser backend for offline documentation has fewer capabilities when it comes to CSS and JavaScript support. These defines allow us to use \if conditionals when needed: /*! \if defined(onlinedocs) <Content that is rendered in online documentation> \else <Fallback for offline docs> \endif */ Change-Id: Ia51acb937754f22f2ece2836b4fb1470bf9ade90 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Doc: Fix broken links after page renamePaul Wicking2018-07-311-1/+1
| | | | | | | | | | | The title of the external page 'Creating a Mobile Application' in the Qt Creator docs has changed to include a space between 'Qt' and 'Creator'. This caused the filename to change, thus breaking the incoming links from the Qt for (iOS|Android) Examples pages. Task-number: QTBUG-69678 Change-Id: I7819a9e2b483bc760af5bb636841bccf0c6cb739 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* Doc: Update external links to Qt Creator ManualLeena Miettinen2018-07-201-9/+41
| | | | | | | Reflects version 4.7. Change-Id: Ia41b5c1a7eb829ab3c6ec0d3bd9fe60dcbfed54d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Correct the documented visibility of some Widget methodsPaul Colby2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Specifically, commit e80a3b49c0aac237104e1696fc64b3a924c89ca1 introduced the use of some QT_VERSION_CHECK macros to distinguish some methods' visibility between Qt 5 and Qt 6, however the QDoc falsehoods variable (added sometime prior) was sensitive to whitespace, and did not correctly recognize those version checks. This resulted in some methods being incorrectly documented as public instead of protected, or vice versa. This change simply makes the QT_VERSION_CHECK in QDoc falsehoods allow for optional whitespace. Methods affected by this change (in documentation only): * QListWidget::dropEvent() * QTableWidget::items(), ::indexFromItem(), itemFromIndex() * QTreeWidget::items(), ::indexFromItem(), and itemFromIndex() Task-number: QTBUG-68005 Change-Id: Ibe3e780334a9a915989ed43b5cdda6915c9161ec Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Update br tag in html footer for XHTML compliancePaul Wicking2018-06-221-2/+2
| | | | | | Task-number: QTBUG-68459 Change-Id: Ie7c4a4e6d49c49db5814ee9b0a36387bed74fd38 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: Use index.html as the home page referenceTopi Reinio2018-06-051-1/+2
| | | | | | | | | | | QDoc links to the homepage in the navigation bar; use index.html for linking instead of "Qt $QT_VER" to prevent incorrect links to section titles that clash with that string. Task-number: QTBUG-62484 Change-Id: I53ced31b7ce35d69579a8c70cbc475e306fd3b18 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Doc: Increment copyright year in global doc templatesLeena Miettinen2018-04-044-4/+4
| | | | | | | Change-Id: I687ea95c0985c361ffb75ea3c162615b0abbb7f7 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-141-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
| * Doc: Mention exact Qt version the third party attributions apply toKai Koehne2018-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do add, remove or update third party code in minor releases, sometimes even in patch level releases. However, the documentation is supposed to be valid for all existing Qt 5 versions, but doing this for attributions would require infrastructure we don't have. Therefore rather make it explicit which Qt version the attributions apply to. Also mention since when Qt is available under LGPLv3 (starting with Qt 5.4). Task-number: QTBUG-65665 Change-Id: I328b5bf0c143f78ea61aad51f0644c3cbb6dee49 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qdoc: Remove __cplusplus from the defines listMartin Smith2018-02-031-3/+1
| | | | | | | | | | | | | | | | __cplusplus was removed from the list of defines passed to qdoc because it should not be there for clang-qdoc. Change-Id: I32802e68d915f7a5b717f16ba26a1cd57d7ff645 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Remove the default list of highlighted examplesTopi Reinio2017-11-131-20/+0
| | | | | | | | | | | | | | Each module now maintain the list of examples to highlight separately. Change-Id: Ib9bca8d945bb3e81d4176cbbebcb89b1309dc0d4 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | Doc: Remove entries for highlighting QQC2 examplesVenugopal Shivashankar2017-09-291-2/+0
| | | | | | | | | | | | | | | | | | | | The highlighted examples list for QQC2 is maintained separately. Task-number: QTBUG-60647 Change-Id: Ib64ff7a44c6fcaf99058422d76ef6680df310911 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-312-17/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/examples.pro qmake/library/qmakebuiltins.cpp src/corelib/global/qglobal.cpp Re-apply b525ec2 to qrandom.cpp(code movement in 030782e) src/corelib/global/qnamespace.qdoc src/corelib/global/qrandom.cpp src/gui/kernel/qwindow.cpp Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08) src/network/ssl/qsslkey_openssl.cpp src/plugins/platforms/android/androidjniinput.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/widgets/widgets/qmenu.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
| * Fix jumping to anchors with offline styleEike Ziller2017-08-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | If the style changes after the browser already jumped to an anchor, the resulting browser position will be messed up. So, after we changed the style we need to make sure that we jump to the anchor again. Since browsers do not jump to anchors that they already jumped to, that means first jumping to the top, then to the actual anchor. Task-number: QTCREATORBUG-18448 Change-Id: I86c736adab6940903276f8a896b4054ddae11ebe Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Doc: Update Qt Creator Manual link targets to match version 4.4Leena Miettinen2017-08-231-17/+7
| | | | | | | | | | | | Change-Id: Ib784779b09f4bce38ada4833777f873ee510af16 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Add styling for function groupsTopi Reinio2017-08-153-1/+16
| | | | | | | | | | | | | | | | Add CSS rules for grouped function documentation; that is, multiple function signatures sharing the same documentation body. Change-Id: I28de3805a8f5f972a59f6ea4ae32262ac36b69a6 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-063-2/+6
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
| * Doc: add tutorials to overview page Qt WidgetsNico Vertriest2017-07-031-0/+4
| | | | | | | | | | | | Change-Id: I62037ce2190689b2e9c8d62a9d67e1d477e1be42 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Change MinGW link to MinGW-w64Kai Koehne2017-07-031-1/+1
| | | | | | | | | | | | | | We're only supporting builds with MinGW-w64 these days. Change-Id: I1198551ba85132c3f0f81e32f11aa149126ca61f Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Fix navigation with offline styleEike Ziller2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | When the switching to the non-simple offline style is done after document load, the navigation to anchors completely breaks. So, do the switch without the additional delay. Task-number: QTCREATORBUG-18448 Change-Id: I5abbc3bbe1c743d2a5e493bb9e0916c5d092942a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-191-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
| * Doc: Do not exclude *_x11.cpp files from the documentation buildTopi Reinio2017-06-131-2/+1
| | | | | | | | | | | | | | | | QX11Info class from the Qt X11 Extras module is documented in qx11info_x11.cpp, and it needs to be parsed. Change-Id: I32e8415d93e67dbf16267d4af63979c1db0870b0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-292-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/win32-g++/qmake.conf mkspecs/win32-icc/qmake.conf src/platformsupport/fontdatabases/mac/coretext.pri src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
| * Doc: Add highlighting for a number of examplesTopi Reinio2017-05-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Qt Bluetooth: Bluetooth Low Energy Heart Rate Game - Qt Charts: Chart Themes Example - Qt Data Visualization: Bars Example - Qt Data Visualization: Surface Example Task-number: QTBUG-53728 Change-Id: I960532deedc7e24dc5cd3e452ab1908b367e6d8e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Merge 5.9 into 5.9.0v5.9.0-beta4Oswald Buddenhagen2017-05-042-0/+2
| |\ | | | | | | | | | Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7
| * | qdoc: Reintroduce Q_OS_* defines into the global documentation configTopi Reinio2017-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was dropped by commit 740ff1b8 in preparation for clang-based C++ parser in qdoc. However, the old (current) parser still needs it, as some of the functions to document are wrapped with those macros. It does not interfere with the clang parser anyway; unlike the old parser, clang will not resolve the wildcards in macros. Change-Id: I3135a263e8eb200a11b1e918c776e3a2c3ec5fb6 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-072-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreply.cpp tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
| * | Doc: Highlight wearable demoVenugopal Shivashankar2017-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Only example app that demonstrates the use of Qt for a wearable device. Change-Id: I7656f809b0219e9a2c8cd61985445ecff8b2c174 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | qdoc: Ignore QT_POPCOUNT_CONSTEXPR tokenTopi Reinio2017-05-031-0/+1
| |/ | | | | | | | | | | | | | | This enables a number of functions declared in the qalgorithms.h to be successfully documented. Change-Id: I20c5827bb8f9e2ada98fd368b7827c5b156a518e Reviewed-by: Martin Smith <martin.smith@qt.io>
| * qdoc: Do not exclude *_p.cpp files from source files to parseTopi Reinio2017-04-261-1/+0
| | | | | | | | | | | | | | | | Some of the public APIs are still documented in private (_p.cpp) source files. Let qdoc parse them. Change-Id: I29ad87c21d663504f2b947d8b9ed76609c7946f3 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-201-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
| * Split Q_COMPILER_UNICODE_STRINGS: add Q_STDLIB_UNICODE_STRINGSMarc Mutz2017-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bf2160e72cd8840a8e604438cbdc807483ac980a, we can rely on charNN_t support in all compilers except MSVC 2013, and since that commit, we use (in 5.10, not 5.9, yet) !defined(Q_OS_WIN) || defined(Q_COMPILER_UNICODE_STRINGS) when we only need charNN_t, the type, as opposed to its library support (u16string, char_traits<char16_t>, ...). This patch splits the Q_C_UNICODE_STRINGS macro into two, adding Q_STDLIB_UNICODE_STRINGS for when we need std::uNNstring, leaving Q_C_UNICODE_STRINGS for when we need just charNN_t support. In QDebug, when constructing a QChar out of a char16_t, cast to ushort first, since QChar(char16_t) was only officially introduced in Qt 5.10. [ChangeLog][Potentially Source-Incompatible Changes] The internal Q_COMPILER_UNICODE_STRINGS macro is now defined if the compiler supports charNN_t, even if the standard library does not. To check for availability of std::uNNstring, use the new Q_STDLIB_UNICODE_STRINGS macro. Change-Id: I8f210fd7f1799fe21faf54506475a759b1f76a59 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Remove the Windows XP style from public accessibilityJake Petroules2017-04-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later, the Windows XP style will be removed entirely by means of being merged with the Windows Vista style (which inherits from the XP style). There was actually no reason for these styles being separate classes in the first place, because both result in the same appearance for controls on the running version of Windows. Therefore, the windowsxp style merely appears as a "broken" version of the windowsvista style, with only minor differences based on the additional metrics that the vista style provides. The windowsxp style does NOT, and never did, allow users to get a Windows XP style appearance on Windows 7 and above (which is currently Qt's minimum supported platform). Therefore, now that Qt no longer supports Windows XP, the windowsxp style is unusable. [ChangeLog][QtWidgets] The windowsxp style is no longer available as a separate style, because it did not (and cannot) actually provide an XP-style appearance on currently supported Qt platforms. Change-Id: I513d9bce3f247f97cfb28dfee88fe888469e0a6f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-041-0/+4
|\| | | | | | | | | | | | | | | Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
| * Doc: Add Creating C++ Classes to externalsites/qtcreator.qdocNico Vertriest2017-03-291-0/+4
| | | | | | | | | | | | | | qtquickcontrols2-customize.qdoc:28: warning: Can't link to 'Creating C++ Classes' Change-Id: I7e8e84d7a0d03a84f32d860bc646640e5cf6258f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-204-0/+57
|\| | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemengine_win.cpp src/gui/text/qdistancefield.cpp src/plugins/platforms/xcb/qxcbconnection.h Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-134-0/+57
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/network.pro mkspecs/features/mac/default_post.prf src/corelib/io/qfilesystemengine_win.cpp src/corelib/io/qprocess.cpp src/corelib/io/qprocess.h src/corelib/io/qprocess_p.h src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/corelib/thread/qmutex.cpp src/platformsupport/fontdatabases/windows/windows.pri src/plugins/platforms/eglfs/eglfsdeviceintegration.pro tests/auto/corelib/io/io.pro Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
| | * Doc: Add macro for embedding YouTube videosTopi Reinio2017-03-064-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro adds a \youtube <ID> command that embeds a YouTube link into the documentation. The video container scales to a specified percentage of the available horizontal area. It assumes a source aspect ratio of 16:9, but looks acceptable with other ratios. For backends that do not support <iframe> (e.g. QTextBrowser), shows a clickable video thumbnail that open the YouTube link in an external browser window. Unfortunately, QTextBrowser cannot load images from a remote URL, so we need to store a thumbnail image in the .qch file. Change-Id: I3a3a0c5a20dd90e5cec6357ba70a23ee47dbe825 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-141-0/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/widgets/qpushbutton.cpp Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
| * | Doc: Ignore QT_SYSINFO_DEPRECATED_XTopi Reinio2017-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | QSysInfo has a customized deprecation directive that QDoc needs to ignore to generate documentation for the deprecated functionality. Change-Id: I1c378f14a2f842f1e9a55614d43fe509bb77fd89 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-02-101-1/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/widgets/qmainwindowlayout_p.h Change-Id: Id406a67606b885052ed405b0fbc8eea7d9d03224
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-081-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
| | * Doc: Ignore QML/JavaScript parsing errorsTopi Reinio2017-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc reports warnings for every QML code snippet that's not a complete QML type declaration - ignore these warnings because in majority of the cases, they're not indicative of any actual problems in the code. Change-Id: I53d13e2ae683ca8c5473f68eda17c61199de1ff8 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 05:46:20 +0000