summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Revert "QDoc: Make Generator::fileBase static"Topi Reinio2021-04-167-13/+18
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3e67b5e4df84421b77f90cbf242abb4a3c4c93a5. The original implementation where fileBase() was a virtual function, overridden by HtmlGenerator, was needed as that generator is the only one that conditionally appends '-obsolete' to output file names. By using a shared static helper across all generators we broke that feature. Modify the revert to resolve conflicts and override fileBase() also for WebXMLGenerator; .webxml output should not refer to files with -obsolete suffix. Fixes: QTBUG-92478 Change-Id: I7a7e3ef333724c96624569dd27b4812196931fb0 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f970effa9de5ad5e7d0445458d3d43582bbdc695) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Tag Q_INVOKABLE functions with [invokable]Topi Reinio2021-04-161-0/+2
| | | | | | | | | | | The code parser already tracked the invokability of a function; tag the function signature when generating the detailed documentation. Fixes: QTBUG-79698 Change-Id: I42d727f762b488b13dd10b400c5c07453c60cbac Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8aa4beaff186063b24a3760a1f36a3184f8bf2e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Correctly handle const property typesTopi Reinio2021-03-192-13/+21
| | | | | | | | | | | | The property type defined in Q_PROPERTY may contain the const qualifier. Store the qualifier and make the code a bit more robust against ill-formatted property declarations. Fixes: QTBUG-91990 Change-Id: I6b06e4c8af8bb9dec3c467c6e19d9987b8340110 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 526604ea5705ba9c61161da98dafda93cafc5fba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Fix possible crash in WebXMLGeneratorJiDe Zhang2021-03-181-1/+1
| | | | | | | | | | | In the at WebXMLGenerator::startLink, the "atom" argument maybe is nullptr. Fixes: QTBUG-91754 Change-Id: Ie97607ab9a1afc9f0df632b0448aa3294679180c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f4861c9a5aba08b13ec77cc5a6c754a08311db02) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Remove obsolete command codePaul Wicking2021-03-131-15/+0
| | | | | | | | | | These commands were removed when DITA got pulled out of QDoc. Remove the defines that were left behind. Change-Id: I534d1a2143778394bee212c1938c93d42ab29755 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 28bbb5743345e5f4e798e47bb77c15038bf091df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Clean up example snippets in QDoc manualPaul Wicking2021-03-121-30/+10
| | | | | | | | Fixes: QTBUG-91746 Change-Id: I36c0d09bfa8ce17d6cf6f3297f2e57c857ce9322 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 9c6638d8d8e1448faf112aac4ae784fd9ef003e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix link in QDoc manualPaul Wicking2021-03-121-2/+2
| | | | | | | Change-Id: I054568a7842a776f4a78069f991970ae030d4f05 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 5d9e0186253de24282609ffb6fd53058a805a52f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: update manual to use links to Qt6 documentationIvan Solovev2021-03-041-14/+14
| | | | | | | | | | QDoc command index was still using the links to Qt 5 docs in the examples. This patch updates them to use Qt 6 docs. Change-Id: Ie422354090dad72263ccccac419c5ccc9fb5ca8c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 7a558817d43ccf597fb114d3992b0b5105edd83c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Drop \internal entities from the indexTopi Reinio2021-03-031-2/+6
| | | | | | | | | | | | | | Skip nodes marked as \internal from the generated index files, unless --showinternal option was set. This reduces the size of index files, improves performance, and also avoids linking issues in corner cases where QDoc is searching for a specific function overload but fails to find it because the link target matches with an internal node. Fixes: QTBUG-91409 Change-Id: I062e261a86e737fde0f138264244324d43091270 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 616d0b5dc3a2ad63afa2812027f91fc17c507b69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Linguist: Fix the phrase view suggestion shortcuts to workFriedemann Kleint2021-02-243-29/+8
| | | | | | | | | | | | Remove class GuessShortcut which had a bug (connect to wrong signal of QShortcut) by a lambda expression. Do not create a shortcut for phrase 10 which resulted in CTRL+':'. Change-Id: I26f35ece1bcdd2e75a56b8e4f1f69987a8054e52 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 4ad7a232cce5fd4e5ec88c2df46ca1e564772913) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix regression in handling of global functionsTopi Reinio2021-02-221-4/+14
| | | | | | | | | | | | | | | | | | | Commit 550c3031 improved the handling of \relates command, but introduced a regression; When relating a primary function (a first in the linked list of overloads) to another aggregate, the primary's nextOverload pointer was cleared. Subsequent \fn commands trying to document other overloads then failed. The correct way is to move the head of the linked list forward. However, if there are no overloads, we do not want to delete the list entirely, as the function (typically, a global one) must be searchable from the original (global) scope. Fixes: QTBUG-91244 Change-Id: If80fa93ac5231d0676c0809f1acfa97733f9f9e8 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 026edd4bcefd6f0cffa72c2385407c28042b4b36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Allow any type of page as qhp indexTitleTopi Reinio2021-02-191-1/+3
| | | | | | | | | | | | As a corner case, some documentation projects may want to use something other than a \page as the index page. As a fallback, look for any node that generates a page and has a name matching with qhp.indexTitle. Change-Id: I07372e7e4e2ab030674788f59bf0cb3ec0fd2f5e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f96236f027c9e71724d7d185de6af38dc3d1e9e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Windows: Fix crash when instantiating QQuickWidgetFriedemann Kleint2021-02-151-0/+10
| | | | | | | | | QQuickWidget requires OpenGL RHI. Warn and disable it when another API is used. Change-Id: I92b273957ace41d2f5d714ca87ea47c32d3922ec Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 2adb1111e2320b53879600fb932a490b3ab0d332)
* qdoc: Don't clear the warning count in single-exec modeTopi Reinio2021-02-031-1/+2
| | | | | | | | | | | | | | | As the warning count and limit determine the exit code, in single-exec mode we need to keep track of the number of warnings for all documentation sets that are part of the build. This assumes that each documentation set retrives the warning limit from a shared location in the config. Fixes: QTBUG-90867 Change-Id: I7588a2a945094a02543a2cbd51ec5e3865666b47 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 173ecc34a2e8cf33325703b381003799aaaa42cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump copyright year to 2021Friedemann Kleint2021-02-034-4/+4
| | | | | | | | Fixes: QTBUG-89980 Change-Id: Ice588f78d392f1dfd1f96de8840a3c7e28e4edd1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 0a097b742dcffc04690e98ce2e574febad25014d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix CMake CONDITION expression "win32-icc_x_ OR win32-msvc_x_"Li Xinwei2021-02-021-1/+1
| | | | | | | | | | "win32-icc_x_ OR win32-msvc_x_" never equals TRUE, even when using MSVC or ICC compiler in Windows. Change-Id: I8b72635754da9fdc534013e3f95b98f380b315d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 4a49f40ad8bd56962cc9efea6439a4f9b6ffb9f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix generation of TOC for basic QML/JS typesTopi Reinio2021-01-281-2/+2
| | | | | | | | Fixes: QTBUG-90691 Change-Id: I576849bb291926461f40622278619ffe096036cf Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit cf8eb842984c315e8f0843d88bd6f42b73032117) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Fix warning about copy of loop variableFriedemann Kleint2021-01-191-1/+1
| | | | | | | | | src/linguist/lupdate/cpp_clang.cpp:118:21: warning: loop variable 'source' of type 'const QString' creates a copy from type 'const QString' [-Wrange-loop-analysis] Change-Id: If46d469da6653b9b59a2926080f0b37b74893b52 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b990c0eef564e7c0d35cb3d800e2e558bae45640) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix handling of overloads when adopting functions between parentsTopi Reinio2021-01-144-55/+58
| | | | | | | | | | | | | | | | | | | | | | | | | When adopting a function node from one parent to another, QDoc did not touch the linked list of overloads for the adopted function. This caused situations where traversing the node tree, trying to find functions for an aggregate (parent), yielded also overloads that are not supposed to be found as they are not members of that parent. One visible place was the classes-with-obsolete-members generated list, where QDoc erraneously found obsolete overloads for a class that had adopted function(s) from the global namespace. To fix, remove an adoptee from the overload list of its primary function (maintained by the original parent), and re-add it to the overload list maintained by the new parent. Refactor functions that manage linked lists; using recursion is unnecessary. Fixes: QTBUG-89003 Change-Id: Ibd215cd4b1d97003ac79fe02a71452e4a7a154db Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 550c3031c2fbafe89daec4046dd45946ee8a788b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Do not add functions from \dontdocument classes to function indexTopi Reinio2021-01-141-1/+1
| | | | | | | | | | This caused broken links on 'All Functions' page as \dontdocument classes generate no output. Change-Id: I9edac8722b1705951328c29b51aa34fcac78e420 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2393e68dd5b2566a16cd8296fe0493c77eae22cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix addendums for QML signals that contain '.' in the nameTopi Reinio2021-01-112-4/+6
| | | | | | | | | | | QML signals may belong to a group, and the automatic note generation for corresponding signal handler must take this into account. Fixes: QTBUG-85572 Change-Id: Ibfc793475618fb78a8ba0a0344537917ad6fb0bf Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8a20d5b62dec6d45e6d6d29fd894aa362c3301fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't call a method on potential nullptrJarek Kobus2021-01-081-2/+2
| | | | | | | | | | Amends e7af10cfabeac5d049130f137f54a0b0c9f6fdc4 Task-number: QTBUG-89926 Change-Id: I5c1357f37dcb27bafef6975984958c9f686bc2b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit d1b6d15fdb143b2c4cc937f3e8ba234829eb517c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix potential crashes when using findChild<>Friedemann Kleint2021-01-083-2/+4
| | | | | | | | | | Extends 3f600283ecc9cfcfc65eabd305ad36fbce55dbce. Task-number: QTBUG-89926 Change-Id: Iac2adc26dff190380c4c8cf5610ebc0132efde2d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit e7af10cfabeac5d049130f137f54a0b0c9f6fdc4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Ignore empty example meta tagsTopi Reinio2021-01-081-1/+1
| | | | | | | | | | Incorrectly formatted parameter for the \meta tag command may result in empty tags, and cause an assert later on. Change-Id: I504e038f119833615976ba44549934ccc70aea31 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c8500ae622f47dee84cb1ee2dbf167921de3e5c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Designer: Fix a crash when creating a new formJarek Kobus2021-01-081-0/+3
| | | | | | | | Fixes: QTBUG-89918 Change-Id: Id26c68ccbb0ce8410c5ccd719ec82a8f4d183105 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 3f600283ecc9cfcfc65eabd305ad36fbce55dbce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Improve plugin error dialogFriedemann Kleint2021-01-082-5/+45
| | | | | | | | | | | - Wrap the error message shown as tooltip by displaying it in HTML - Add a context menu with copy functionality to error items Change-Id: I74b368a4ea820be061bf8c9529f76418f5f1e68a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 349e17a714c0aa682cee05ae5c5e06a2386b35e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Restore default behavior for compiler runtime deploymentOliver Wolff2021-01-071-2/+4
| | | | | | | | | | | For MSVC desktop and MinGW desktop builds the compiler runtime should be deployed by default. This default was changed by mistake in 317c2b4af885f854a30235959565e0af8376d64f. Change-Id: Ia403f5beb3092aa692584c77cd5f96393f79d456 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit baf783991e36aafe6921a40043b414192fb523a2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix Section::reduce() omitting sections with obsolete membersTopi Reinio2021-01-071-2/+4
| | | | | | | | | | | This caused documentation for obsolete members to go missing if a section had only obsolete members. Task-number: QTBUG-89003 Change-Id: I9fb38bb76af45eda42cddc25bb4f6137e73e6fc3 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 19002292a73d502da9ab4da168b8509cda1d6908) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix breadcrumb generation for normal page nodesTopi Reinio2021-01-051-2/+2
| | | | | | | | | | | | | If a \page uses a single \ingroup command and a matching \group exists, QDoc is supposed to add a link to that group in the navigation bar (breadcrumbs) for that \page. This was broken as a result of a changed inheritance structure of nodes. Fixes: QTBUG-89835 Change-Id: I915d7ae41866fa89fcd0b133b4827f2e3d55bd54 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 228be3bd697a70a31c26c26d6d21d7bd0aebceda) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Remove special handling of the removed QLayout::margin propertyFriedemann Kleint2021-01-041-34/+15
| | | | | | | | | | | | | Fixes a warning: ** WARNING virtual void QDesignerPropertySheet::setAttribute(int, bool) invoked for "" was passed an invalid index -1 . when loading forms with layouts. As a drive by, rewrite the hash initialization using initializer lists. Change-Id: I161edb192d45b9ff2f8fd347940f9dccfc54052e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 7e3fe77ad3965a8e69afabda3fdb60aecc05fb0a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Open Qt 5 forms using QComboBox::AdjustToMinimumContentsLengthFriedemann Kleint2021-01-041-5/+25
| | | | | | | | | | | | | | | | | The enumeration value was removed in Qt 6 by qtbase/1a342b2db14fa92bca717f5daff950b2eef869f7. Ignore it. Rewrite the functionality introduced by 7641fe2ecda840911db5cdc2a99c45e7a1bcd313 to use a helper function. Task-number: QTBUG-89093 Fixes: QTBUG-89700 Change-Id: Ib451efead32ae82ed6902080cbd30e9cf8702186 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 09b1fb4a3267ebd6dea48709b73105a0281e6b40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Do not unconditionally deploy compiler runtimeFriedemann Kleint2020-12-221-2/+0
| | | | | | | | | | | Remove the code introduced by cc67bbbee6386c10c8282b3ea02f6db654d60c1e setting the option to true. Fixes: QTBUG-89645 Change-Id: Iac94ef9e5beff6fc0b7d48f5afafa16a220cbd99 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 317c2b4af885f854a30235959565e0af8376d64f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Fix namespaced buildsFriedemann Kleint2020-12-181-2/+4
| | | | | | | | | | | | | | Namespaced builds did not apply to windeployqt since it was a host tool in 5.15. This now breaks with cmake. Move main() outside the Qt namespace. Fixes: QTBUG-89597 Change-Id: If97f509a150ffb889a778c1436ef59395c63852a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ae89f19384c526d4285ab92b1b7382cc90949767) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Recursively resolve QML type inheritanceTopi Reinio2020-12-173-38/+42
| | | | | | | | | | | | | | | | | While we store the QML base type name into the index file, the inheritance chain was never rebuilt for nodes read from the index. Do this recursively for index nodes; this provides full inheritance information on 'All members' pages for QML types, provided that all required documentation dependencies are loaded using the 'depends' qdocconf variable. Task-number: QTBUG-89479 Change-Id: Ibafcd3224d7870e7eec7c0ed88d35135b7be3eaf Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 147e098c04c804c97e075834cf24c399acfafc6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix static build of designerJoerg Bornemann2020-12-163-9/+3
| | | | | | | | | | The QT_DESIGNER_STATIC define was not set due to erroneous conditions. Fixes: QTBUG-89515 Change-Id: Ib3292bbc6a97346a9368598f98f9e865400d300d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 0f8eec1d99f84e506632ea33d98446b726a37aed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Regenerate projects using pro2cmake one last timeAlexandru Croitor2020-12-094-130/+0
| | | | | | | | Change-Id: Id8b82e7838c3b142cbd9118689bafae0bbe2beb1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 3c017e3affcc71c8f4741b313675b6a4928a6125) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Remove 'doc' from example and demo tagsKai Koehne2020-12-081-2/+2
| | | | | | | | | | We have some demos and examples in QtDoc module. Currently they therefore get a 'doc' tag, which is confusing at best. Change-Id: Ib880cbb03763d9c8afb36061da99f5be7d9b1cb7 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3b439d7df62df419c1b9aadb3dad5970f41d2ea3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtplugininfo: Do not explicitly reference Qt5Kai Koehne2020-12-081-1/+1
| | | | | | | Change-Id: I9d36161752765f675aa3fe02c583cf73493f6361 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit b81f4975b44201e36a13fe045dbe3167ced1b024) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Open Qt 5 forms using QDockWidget::AllDockWidgetFeaturesFriedemann Kleint2020-12-031-0/+5
| | | | | | | | | | | | The enumeration value was deprecated by qtbase/f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 and removed in Qt 6. Ignore it as it is the default. Task-number: QTBUG-89093 Change-Id: Ibfcaaa8a19d2f0744b4ed3373c3926e923ba9bcc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 62a01a553ad94a60162bbe1fc64745f7c6d146ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compile warning following change in qtbaseVolker Hilsheimer2020-12-031-1/+1
| | | | | | | | | | | | | | | | | QPersistentModelIndex casting to QModelIndex now returns a value, not a reference. This fixes compiler warning src/assistant/assistant/bookmarkmodel.cpp:131:29: warning: loop variable 'index' has type 'const QModelIndex &' but is initialized with type 'const QPersistentModelIndex' resulting in a copy [-Wrange-loop-analysis] note: use non-reference type 'QModelIndex' to keep the copy or type 'const QPersistentModelIndex &' to prevent copying Change-Id: I940845d52f9237ea6c8331ecd5cc29289dfefe8c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 85ee44865c96abc368e239c851c09beb2f116bf3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clamp registered collection time-stamp to SOURCE_DATE_EPOCH if setKai Pastor2020-12-011-1/+9
| | | | | | | | Task-number: QTBUG-62697 Change-Id: I73cc41db9c57d050783e963896f9696c294126c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b463cd691b533ee31d602b2226b90d3c528b6a94) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix handling of -extensions argumentKai Koehne2020-12-011-3/+3
| | | | | | | | | | | | | | | | | | | Do not expand _lupdate_options for list commands; depending on the content, this might cause CMake to treat it's content as separate elements. Also avoid IN_LIST; it was only introduced in CMake 3.3, while Qt 5.15 still also supports CMake 3.1, 3.2. Anyhow, we can as well just directly list(FIND...). Amends 2834bebc9e6ba9bf0577db1d7da42a52e622adc6 Change-Id: Ib4c73956477803cc8ec2f4048ffbab8daf2136e5 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Craig Scott <craig.scott@qt.io> (cherry picked from commit 71ed18ed4b07c47e42f60c770bf7f5b4f8be4b20) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Linguist: Install phrasebooksKai Koehne2020-11-302-8/+185
| | | | | | | | Fixes: QTBUG-88972 Change-Id: Icb720cf7b9cdc7ac0cbeead5fee25e590685b1bd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit afd117a4a465e21f33980e495d8883b0f9c41244) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Improve warnings generated for missing example manifest attributesTopi Reinio2020-11-301-10/+14
| | | | | | | | | | | - Add location info for the warnings from the example node - Generate customized warning messages per attribute, making it easier for the writer to fix the problem. Change-Id: I8de6841bdd7fb7c413ae3976ae468884cdb4cfd4 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3d5c71683811d0f18373744556b7522b53684e41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Use PRIVATE linkage with target_link_librariesKai Koehne2020-11-302-3/+3
| | | | | | | | | | | | Fix the CMake snippet in the class documentation pages to use PRIVATE linkage. PUBLIC linkage is only needed if the Qt types are also used in the public API of the user's module. Task-number: QTBUG-88935 Change-Id: If4aee64a25ec8152a2a0ad5b5504f53a41d93079 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a774889df6ee2e07d0f01580bc9e486365200ff5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make windeployqt an optional featureMarius Kittler2020-11-271-1/+1
| | | | | | | | | | | | Considering the existing code in configure.cmake it is already supposed to be a configurable feature (enabled when building for Windows by default). This change merely makes the actual inclusion of windeployqt dependent on this. Change-Id: I3c797df913c07ed80929b41d367b1ebb41d8400f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit c1cd8b32a65d9d65e3a7ec9fcbd6961a39223102) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix example attributes being incorrectly appliedKai Koehne2020-11-271-1/+1
| | | | | | | | | | | | | Once an example had an attribute associated - for instance isHighlighted - all the other examples afterward got the attribute too. This caused a (more or less) random list of examples to be highlighted in Qt Creator. Change-Id: Id09c232f56328d345deb9521651af40ecf750a36 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e2c263a1b980636b62dbfd2037e70ee665a0ad39) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix qdbusviewer.exe missing version and copyright informationLi Xinwei2020-11-274-4/+3
| | | | | | | | | The rc file of qdbusviewer.exe should be generated by the build system. Change-Id: I038d5a092d95089b5f7ff36e48c2657dea230772 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3385dea6e3b69c76fa3a1ec176eee3d84d20f7b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Designer: Use QDesktopServices to show designer help"Kai Koehne2020-11-277-25/+275
| | | | | | | | | | | | | This reverts commit 5f238adc4c652e6e1bb34752f201cf8e377cbc25 and commit 1d994b1471bd43d7003697b47e3f7d2ebfc808df Reason for revert: Qt Assistant is enabled again Change-Id: If28fdcf10686750a43e3cc88b5b846d69ec82cd5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit a1caa657d8f2f561b52b39cf4355dd7b9d217f45) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Linguist: Use QDesktopServices to show linguist manual"Kai Koehne2020-11-272-5/+32
| | | | | | | | | | | | | This reverts commit cbf658dff28e20ae0f2b0dc87a931cf9444559b4 and parts of commit 1d994b1471bd43d7003697b47e3f7d2ebfc808df Reason for revert: Assistant is enabled again Change-Id: I8d39a7c62cb401fdb7ecc6ffb972b57c01969c9b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 42838108d04a114b109379544e1cc2228a74b257) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 03:42:58 +0000