summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qttoolsv6.0.0-beta5Qt Submodule Update Bot2020-11-131-2/+2
| | | | | Change-Id: Ibed45a9036dbdc801f0e348def02a31a12c564bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-131-2/+2
| | | | | Change-Id: I8be6d028392f1c6b40aa39d19e30b6b76ab6ac33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-131-2/+2
| | | | | Change-Id: I1945dd985f6a16689476272d3780574dc1edd018 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-121-2/+2
| | | | | Change-Id: I2982a6d61b4fe4c22b43f1564e12c5a19f752a7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* windeployqt: Adapt module list to Qt 6Friedemann Kleint2020-11-121-57/+25
| | | | | | | | | Remove hopeless modules and add new modules. Fixes: QTBUG-88357 Change-Id: I165edc7a188314522ac7a1321be926552c744ae4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* qdoc: Handle JSON as plain textTopi Reinio2020-11-121-4/+4
| | | | | | | | | | | | The JavaScript code marker failed to handle JSON snippets; drop the advertised support for it, parsing JSON as plain text. This is OK as there's typically no types to link to or highlighting needed for JSON data. Pick-to: 5.15 Fixes: QTBUG-81596 Change-Id: I004fcbe97a66ff5a33c4c443a24d16107aacb4c8 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Windows utils: Remove runElevatedBackgroundProcess()Friedemann Kleint2020-11-122-40/+0
| | | | | | | It was used by winrtrunner. Change-Id: If24d854c6ba0514c464aa49acbe99c1a0def7fa4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Qt Designer: Fix build of the QAxWidget pluginFriedemann Kleint2020-11-121-1/+1
| | | | | | | Use QUuid::fromString(). Change-Id: I5e40c890ff7f64b7c542adc91355492ea27543cd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Qt Designer: Fix MSVC warning about integer conversionFriedemann Kleint2020-11-121-1/+1
| | | | | Change-Id: I69fcb0fdd03e2b87c4b6df6b941853234d4adb30 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-121-2/+2
| | | | | Change-Id: I6edac4a191d7da30a78ac3ca72f7dcbdc20319ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Typo fixRalf Habacker2020-11-111-1/+1
| | | | | | Task-number: QTBUG-87058 Change-Id: I822be17765f411e26f1596e29e1c8bd6573c8710 Reviewed-by: David Faure <david.faure@kdab.com>
* Update dependencies on 'dev' in qt/qttools manuallyLiang Qi2020-11-111-1/+1
| | | | | Change-Id: I7cc2f0bcae3f84b6a7d6b777a4bb7fa90a364bad Reviewed-by: Liang Qi <liang.qi@qt.io>
* tst_generatedoutput: find expected files correctlyDavid Faure2020-11-111-1/+1
| | | | | | | | | | | | | | QFINDTESTDATA(.) first matches :/. (in the resource subsystem) so this led to QFAIL("Cannot open expected data file!"); because it was looking for :/./expected_output/qdoctests-qdocfileoutput.html Not sure how this ever passed on CI. Change-Id: Ia4de8e35eb352b2c560d1fc92a1f837be0c20b9d Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qttools: compile with explicit QChar(int)David Faure2020-11-116-7/+7
| | | | | | | | | | Notice how this caught a bad bug: the code was generating "listitem\001" instead of "listitem1" It seems no unittest covers this, they all pass, still. Change-Id: Ibb22231c9dc3e61d3ea0a84894e451c621d50121 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* qdoc: Fix linking to property groupsTopi Reinio2020-11-1111-13/+112
| | | | | | | | | Only the members of a property group were written to .index, not the group itself; this made cross-module linking to the group fail. Fixes: QTBUG-88386 Change-Id: I096a2bbdd2b0af00c4d0e9a6974b6dc7dce075a2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qtdiag: Fix deprecation warning about QVariant::TypeFriedemann Kleint2020-11-111-1/+1
| | | | | Change-Id: Ie4e83f7575d28e8b644243b8166ab7f685b2b3a7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-111-2/+2
| | | | | Change-Id: I800935adba287f52fee16b6454df0028c0a35602 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-111-2/+2
| | | | | Change-Id: I4a22361db150b87520b4b5d5fc532b15328e0abd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace prefined application name by a generic nameRalf Habacker2020-11-101-50/+60
| | | | | | | | | | If the path returned from a call to a method of the QStandardPaths class contains the application name 'qtpaths' it is replaced by '<APPNAME>' to output this generic name. Task-number: QTBUG-87058 Change-Id: I7a9e848f42bf94ef4bbd4757e77ccfeefa8dfa9f Reviewed-by: David Faure <david.faure@kdab.com>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-101-2/+2
| | | | | Change-Id: I38f2e6816c4dc91687c1e9f21807c60560702fc1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Unify generated documentation between \typedef and \typealiasTopi Reinio2020-11-0927-140/+78
| | | | | | | | | | | | | | | | | | | | | | | | \typedef can be used as a substitute for \typealias for documenting aliases. Since they are identical in terms of usage, unify also the way they are documented: - Remove 'typedef' and '(alias)' from both the summary and details sections, making both appear as types. - Remove automatically generated 'This is a type alias for ...' note for type aliases. This typically resulted in duplicate statements. - Use '-typedef' anchor suffix for both. - Use 'typedef' as element for both in .index files and webxml output format. - Add template parameters for type aliases for DocBook generator; these were previously missing. Fixes: QTBUG-87622 Change-Id: I93986a2dc91c3c3dff9e21f5bf5cf19d0b55c4df Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Allow type aliases as a parameter to \class commandTopi Reinio2020-11-095-0/+66
| | | | | | | | | | | | | | | | In Qt 6, some types that used to be classes are now type aliases or specializations of a templated class; for example, QPair is now an alias to std::pair. While the \typedef command supports aliases, it's not always clear where the reference of such type should live, as a \typedef cannot generate a page of its own and needs to be related to some other aggregate (class, header, or namespace). Therefore, allow aliases to generate a type page using the \class command. Fixes: QTBUG-88012 Change-Id: Ice67d58eb036299c0fd04f6ed48a846bfed8ed1d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qttoolsv6.0.0-beta4Qt Submodule Update Bot2020-11-091-2/+2
| | | | | Change-Id: Ib4cf31011b7c9e8885424f9079f591fd627c223d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Unblock -developer-build in qt5.gitKai Koehne2020-11-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | LinguistTools is not created yet when the cmake test is configured, resulting in -- Could NOT find Qt6LinguistTools (missing: Qt6LinguistTools_DIR) CMake Error at qttools/tests/auto/cmake/linguist/CMakeLists.txt:38 (find_package): Found package configuration file: /home/qt/depot/qt5/qtbase/lib/cmake/Qt6/Qt6Config.cmake but it set Qt6_FOUND to FALSE so package "Qt6" is considered to be NOT FOUND. Reason given by package: Failed to find Qt component "LinguistTools" config file at "" Work around this by explicitly disabling the autotest. Fixes: QTBUG-88264 Change-Id: I7712098dbe58cefbabf8825058ca42b2f34135f6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Assistant: Fix missing documentationJarek Kobus2020-11-091-1/+1
| | | | | | | | | | | Move a call to initFileSystemWatchers() after setting the readonly mode, since initFileSystemWatchers() triggers setup with unwanted mode. Broken by accident in 15d7a30d41b423846fc74d9dd252c1e2a84769e2 Fixes: QTBUG-87783 Change-Id: I6d79fea010af28c2a839ef4aa6f0f802669ea7bd Reviewed-by: hjk <hjk@qt.io>
* qdoc: Allow excluding examples from the generated manifest fileTopi Reinio2020-11-098-68/+101
| | | | | | | | | | | | | | | | This allows us to cleanly control whether an example appears in Qt Creator's welcome mode or not, while still generating the example documentation. This can be done with \example path/to/example \meta tag broken Delay writing the manifest attributes until we know whether to generate the example element or not. Fixes: QTBUG-88181 Change-Id: Idbd23244ffdb0c6b7ca87f927cb6d2ed3a526b2a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-091-1/+1
| | | | | Change-Id: Ieca2725fa7a9842243127635e9240ae85a40ed78 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-091-2/+2
| | | | | Change-Id: If2dfb502859e97e8a485fad69bfc6c496ddcf567 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-081-2/+2
| | | | | Change-Id: I95db4a44947f16aabd65a57c2ce698d7f5813f1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-081-1/+1
| | | | | Change-Id: I855f750ae5ca165c76afad977852559445c83880 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Enforce zero documentation warning policyTopi Reinio2020-11-077-0/+14
| | | | | | Task-number: QTBUG-78069 Change-Id: I3809c090fd46fefeefaad003d648f9d9db56f8f5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Fix documentation warnings for qttoolsTopi Reinio2020-11-076-55/+15
| | | | | | | | Fix linking failures caused by the removal of Qt Assistant, and fix usage of obsolete/removed functionality. Change-Id: Iaefbebcc1371b41429377dc8219101bda9fbf79a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-071-2/+2
| | | | | Change-Id: I70720aeffc6a48f57b7cae00161e4a19b3ac5302 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-061-2/+2
| | | | | Change-Id: I2e6c9b0c1e46451cc34c034855e9b87a0a007718 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake Build: Skip separate debug info for qdoc on MinGWKai Koehne2020-11-061-0/+5
| | | | | | | | | | With MinGW 8.1.0 objcopy / strip fails when doing the separation of the debug information. See commit c3976188bd20a15a0 for the fix in lupdate. Change-Id: Ife60078e05f7b10a002a3337387e36d5fe18b822 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Linguist: Use QDesktopServices to show linguist manualJarek Kobus2020-11-062-32/+5
| | | | | | | Task-number: QTBUG-86746 Change-Id: Iead8fd3f8149432e99e19057c797b2f0c202a6a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Designer: Use QDesktopServices to show designer helpJarek Kobus2020-11-067-275/+25
| | | | | | | Task-number: QTBUG-86746 Change-Id: I3533c8eecacda4f8edf31c912c3c75e707549b19 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove deprecated qcollectiongeneratorJarek Kobus2020-11-067-162/+1
| | | | | | | | qhelpgenerator should be used instead. Fixes: QTBUG-82336 Change-Id: I09b8bbf9245c892ec7cff903405b6859ba74ae30 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-061-2/+2
| | | | | Change-Id: I28e39df8d8371c18f45fa3f1f067cca2becdd60c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Exclude assistant from buildJarek Kobus2020-11-057-33/+16
| | | | | | | Task-number: QTBUG-86746 Tash-number: QTBUG-88123 Change-Id: Ia086ab9a7c193e7829ef886929dc921432f67a1b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-051-2/+2
| | | | | Change-Id: I620100e191ec3595aa21d4a6644b539132b28026 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Linguist: Remove code path for reading config files from Qt < 4.5Friedemann Kleint2020-11-051-5/+1
| | | | | | | | It was causing a deprecation warning about QVariant::Type. Change-Id: I87a2aedea630d5105eebffbf0787ec43ebe79cd0 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-041-2/+2
| | | | | Change-Id: Iaf149a773ed27b9cef0309d4fb8200f54cbc4200 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Port linguist macros to Qt 6Kai Koehne2020-11-0417-123/+181
| | | | | | | Fixes: QTBUG-87870 Change-Id: I554b0ededd59dc60fec6a18759e2a400ce594f4d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMake: Fix usage of qt_create_translation in a CTestKai Koehne2020-11-041-1/+1
| | | | | | | | | | | | | | | | | | Commit 1b006ab3d8954 declared an input file generated by CMake as a BYPRODUCT of the consuming file to fix a policy warning CMP0058. Anyhow, this is technically incorrect, since the file is actually not produced, but consumed by the lupdate command. The incorrect fix also had the side-effect that ninja clean did remove the file, which prevents the use of the macro in CTest. Just remove the BYPRODUCT declaration. The file is written by CMake, so it actually doesn't need neither to be listed in DEPENDENCIES nor in BYPRODUCT. Task-number: QTBUG-71354 Pick-to: 5.15 Change-Id: I7e5677f2bbd84b8a9fffdcb73465dfae6012ceb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qt5_create_translation: Fix handling of directory dependenciesKai Koehne2020-11-041-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | lupdate supports whole directories as sources. Anyhow, in this case we cannot just declare the directory as dependency; it will force lupdate to re-run every time and emit a warning: warning MSB8064: Custom build for item "..." succeeded, but specified dependency "<the directory specified as a source>" does not exist. This may cause incremental builds to work incorrectly. The patch checks if each specified source is a directory, and if so: * Generates globbing expressions for the list of extensions to be used. * Search the specified directory for matching files. * Add those files to the list of dependencies to give to CMake instead of the directory itself. The list of source file extensions is derived from lupdate defaults, but can be tweaked by a new '-extensions' argument. Original patch done by Chris Djali. Fixes: QTBUG-86192 Pick-to: 5.15 Change-Id: Icc22be4f3ee096361ac319208261cdc8191d9adf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Partially revert "Remove old Qt 5 CMake build system files"Kai Koehne2020-11-041-0/+136
| | | | | | | | | | | This reverts parts of commit 8d100101aa7e8635718d97c0621699e20e5c272e. We should not just get rid of the cmake macros, but instead make it ready for Qt 6... Task-number: TBUG-87870 Change-Id: I03331ce97ba60629f16977c88fe06a80172bdedd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix FindWrapLibClang.cmake for multi-config buildsJoerg Bornemann2020-11-021-1/+11
| | | | | | | | | | Do not error out if CMAKE_BUILD_TYPE is not a release configuration. In the multi-config case we must check that CMAKE_CONFIGURATION_TYPES contains at least one release configuration. Fixes: QTBUG-88039 Change-Id: I3b8eeede297dae8d0149739928431bc6e416396c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Re-indent FindWrapLibClang.cmakeJoerg Bornemann2020-11-021-32/+32
| | | | | | | Fix the inconsistent style to simplify future edits. Change-Id: I885c459d3275920c30eb2b9b200aa6a5ae420761 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake Build: Skip separate debug info for lupdate on MinGWCristian Adam2020-11-021-0/+4
| | | | | | | | | With MinGW 8.1.0 objcopy / strip fails when doing the separation of the debug information. Fixes: QTBUG-87613 Change-Id: Ica3f11eaef0748fc300fdda6e57fa3db08b77908 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 14:45:32 +0000