summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Flush wcout before exiting the appLars Knoll2018-05-241-0/+1
| | | | | | | | | Apparently not flushing caused the output to be truncated on some windows machines when redirecting to a file. Task-number: QTBUG-67860 Change-Id: I82a49286114dcb4dd1f264153363999ec81edd6f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qdoc: WebXML generator: List related non-members in the outputTopi Reinio2018-05-231-0/+2
| | | | | | | | | Related non-members of a class are not children of the class node but a separate data structure. Change-Id: If440788d37f6d3f18f939d9759f4d2f9fcc0c8a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-182-200/+213
|\ | | | | | | Change-Id: Ib45be3626278d9bac03ff0b8f8ab0487ada2d206
| * Fix logic for choosing static or dynamic libclang linkagev5.11.0-rc2v5.11.05.11.0Simon Hausmann2018-05-161-1/+1
| | | | | | | | | | | | | | | | Amends commit 36e7b1925e2ff2df167280eb3592b99697a1234d. Task-number: QTBUG-68178 Change-Id: Ie2f9ac98740b7cef325426da2efff469382444e7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Allow to link qdoc dynamically to libclangJędrzej Nowacki2018-05-142-200/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For releasing we want to link qdoc statically to libclang and ship a "fat" binary, which allows us to not distribute separate libclang. In the same time our users may want to link qdoc to an existing libclang binary. Both cases make sense, especially that the static build required some invasive patches in libclang. Partially reverts fddf7ee536e4fd0061d0ee933707881cebe54223 Task-number: QTBUG-68178 Change-Id: Iaeab59c40b881907f0fd5f3ccefb6700dcd2dded Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-093-3/+274
|\ \ | |/ | | | | Change-Id: I157112adcd7e754a2243c1aa13c75c140dbc6369
| * Fix disabling of qdoc build when cross-compiling with MinGW hostv5.11.0-rc1Simon Hausmann2018-05-031-1/+1
| | | | | | | | | | Change-Id: I5a069821a0dd05328e98eca9ba201b44bedd6cbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Disable QDoc on MinGWJędrzej Nowacki2018-05-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These two changes broke QDoc build on MinGW: "Link qdoc to static libclang" (fddf7ee536e4fd0061d0ee933707881cebe54) "Update clang version to 6.0" (c5ddbdb86b837fcdd406d12e66d8193c991bde) To get Qt 5.11.0 release out in time we need take a shortcut and disable the QDoc build. We agreed that qdoc binary will not be provided on mingw530. Task-number: QTBUG-66015 Change-Id: I25c6014754c58bc3202af645ef77ebc8bfaf1291 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Link qdoc to static libclangJędrzej Nowacki2018-04-292-3/+202
| | | | | | | | | | | | Done-with: Mikhail Svetkin <mikhail.svetkin@qt.io> Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Add changes file for Qt 5.11.0Antti Kokko2018-04-261-0/+65
| | | | | | | | | | | | Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: If9838f027e59686a49f7e7c590f4d4fb8eaa3261 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Warn when an asset is discarded due to unmet dependenciesAleix Pol2018-04-201-11/+7
|/ | | | | | | | | When generating apks we sometimes remove some assets because they won't be useful at runtime anyway. Make sure the pacakger knows so he can take action if required. Change-Id: I91c8f82b0d21d4fe0757d0a4d6f193b984c97627 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* windeployqt: Improve detection of Qt librariesFriedemann Kleint2018-04-191-7/+5
| | | | | | | | | | Remove the special handling which is no longer relevant and check on the major version in addition. Task-number: QTBUG-67762 Change-Id: If9acabfb6c9d9f6ff1fccf91c98ddd540415ab49 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* linguist: Add Done action in Translation menuJosep Llodrà2018-04-186-1/+33
| | | | | | | | | | | | | | | In some situations you may want to mark a message as Done without automatically jumping to the next untranslated message. If you are revisiting (or fixing) some specific translations, using "Done and Next" would constantly jump to another segment for every change made. You can now mark a message as translated using Alt+Return, but also through the Translation > Done menu item. Change-Id: I1a3c95fcf321a793c1b726ec13733c61f15caa05 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Mateusz Starzycki <mstarzycki@gmail.com>
* linguist: Show context also for guesses without shortcutJosep Llodrà2018-04-171-1/+1
| | | | | | | Amends 04e7f6668d. Change-Id: I9401d7bab1266e99fca7df67653410f0e933d61d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qdoc: WebXML: Fix generation of module pagesTopi Reinio2018-04-171-1/+1
| | | | | | | | | Collection nodes (such as module pages) are no longer aggregates, check for them explicitly. Task-number: QTBUG-66545 Change-Id: I6b50a049138c44f2e99fe06cebc99887f2408c2e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* linguist: Add actions in View menu to show more/fewer guessesv5.11.0-beta4Josep Llodrà2018-04-134-4/+76
| | | | | | | | | | | | | | | | | | | | Three actions have been added to the main View menu (Guesses submenu) in order to easily change the number of Guesses displayed. View Menu ...... Guesses > Show more (alt - +) [shows 5 more guesses] Show fewer (alt - -) [shows 5 fewer guesses] --- Reset to default (alt - 0) [resets to 5 guesses] ...... Motivation behind this commit is that in large UIs with thousands of strings, 5 guesses are not enough in some situations to gather all the information necessary to correctly translate a string. Change-Id: I3fdc1b8fc27af40300897cdfd1f9fa3620caad55 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qdoc: Remove duplicate 'const' from function signatures in .indexTopi Reinio2018-04-121-3/+3
| | | | | | | | | | When generating a function signature used in index files (and webxml output), omit adding the 'const' attribute for const functions as FunctionNode::signature() has already added it. Task-number: QTBUG-66528 Change-Id: I7074034d74506d25375603f39b4c2763bd732e4f Reviewed-by: Martin Smith <martin.smith@qt.io>
* linguist: Add Regular expression checkbox in Find DialogJosep Llodrà2018-04-115-58/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is possible to search using a Perl-like regular expression. This enables the user to perform powerful searches. There are many scenarios in which this is convenient, let me show an example: Source (Eng) | Translation (Spa) ------------------------------------ From Desde From De ... from ... ... de ... ... of ... ... de ... from 1 to 10 de 1 a 10 (plus many other strings also containing "de" or "desde") Even simple Regular Expressions like ^Desde$ ^De$ from \d+ to \d+ become very convenient for fine-grained searches. If the regular expression written in the Find Dialog is not valid, text is highlighted in red and Find button is disabled. Change-Id: I90bb55d190d46263ec6adc27256d9c62a69e7f87 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: Fix documentation warnings for Qt DesignerTopi Reinio2018-04-104-4/+26
| | | | | | | | | Add missing documentation for QDesignerFormWindowInterface, fix \fn commands and missing namespace specifiers. Change-Id: I3481781d30760768d4b79d8ea889c1c17b251f67 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* linguist: Show remaining global&context translation counts in tooltipsJosep Llodrà2018-04-092-5/+12
| | | | | | | | | | | | | | | | | | | Linguist shows the number of finished units and the number of editable units in the lower right corner of the window (e.g.: 6714/6833). It also shows this completion progress number per context. With this change, it displays the difference between these numbers in a tooltip (i.e. hovering the mouse on the count 6714/6833), for both global progress count and per context progress count. While this change may be arguable, the remaining count is the number that a translator tracks and is constantly checking, other numbers are less relevant. This small change improves User Experience since the translator doesn't need to use a calculator or do a mental calculation, which takes time and may also lead to miscalculations. Change-Id: Icbb5e73bb4430d28f07eeff790b186579c48c8fb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* linguist: Show context in guessesJosep Llodrà2018-04-093-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Context for each Guess entry from "Phrases and guesses" is shown. This is quite convenient since context provides valuable information. Same source phrase could be in different contexts and the translation for each of them can be potentially different. For example, it would be useful in this situation (English-Spanish): Source phrase | Translation | Definition Add Añadir Guess from 'ButtonToolbar' (Ctrl+1) Add Sumar Guess from 'CalculatorDialog' (Ctrl+2) Addition: Ampliación: Guess from 'SizeEditorDisplay' (Ctrl+3) This is more helpful than: Source phrase | Translation | Definition Add Añadir Guess (Ctrl+1) Add Sumar Guess (Ctrl+2) Addition: Ampliación: Guess (Ctrl+3) Change-Id: I0b77cef0ea5fef95400ea60758cb0a96862e5bef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix possible crash inside connection to the lambdaJarek Kobus2018-04-095-6/+6
| | | | | | | | | Pass "this" context object to the connect(). Otherwise when "this" instance gets deleted and the sender still exists, the lambda expression is still invoked for the deleted object. Change-Id: I0a38489fac302a85abc80928c6244383ff1870ff Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt Designer: Write out idbased-attribute only when setFriedemann Kleint2018-04-061-1/+2
| | | | | | | | | | | | Otherwise, all new forms saved will contain <ui version="4.0" idbasedtr="false"> which causes unnecessary changes and upsets older versions of uic. Amends 85624e87256005a2560a658722da5c982c8374ad. Task-number: QTBUG-34610 Change-Id: Ie688c5b9d1075bca96374d98b682dbbfb8bf7eca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Create QHelpCollectionHandler's query dynamicallyJarek Kobus2018-04-052-180/+203
| | | | | | | | | | | | | | | | It fixes a warning about the use of db from the wrong thread. Before, the default m_query object was created in QHelpCollectionHandler constructor which caused the warning to appear. Now we create m_query object dynamically instead. This also fixed a leak in QHelpCollectionHandler::openCollectionFile() where two early returns, after the database had been opened, neither closed it nor set m_dbOpened. Change-Id: I24484d25d9d90b1a5d6fe4a5acb61c834e2b9599 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qdoc: Query environment variables from qmakeTopi Reinio2018-04-052-2/+30
| | | | | | | | | | | | | | | | | If qgetenv() doesn't return a valid environment variable, try querying from qmake (assuming the variable name starts with 'Q'). This is useful for projects outside Qt, as it allows using e.g. QT_INSTALL_DOCS and QT_INSTALL_HEADERS. The former can be used for accessing the Qt documentation template, and the latter is useful for projects that need to pass Qt's include paths to Clang (which QDoc uses for parsing C++ documentation). The build system doesn't provide these paths when trying to build docs for a module that doesn't build on the host platform; for example, building Active Qt documentation on Linux. Change-Id: I758a5067d3dfdf13cadf979476323faea519ee40 Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Combine anonymous enumsv5.11.0-beta3Martin Smith2018-04-041-4/+13
| | | | | | | | | | When multiple anonymous enum types appear in the same class declaration, merge them into one enum type called "anonymous" in that class. Change-Id: Iccdbec5c54948e5e61a7025d84dedaed1be3e76b Task-number: QTBUG-67243 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qdbusviewer: Disable service list editionAlexander Akulich2018-04-031-1/+14
| | | | | | | | | Service name edit does not actually change a service dbus name, so subclass the QStringListModel and explicitly remove IsEditable flag to make names read-only. Change-Id: Idca77f449eb07cdebb0012cb2fb6e9039be303b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qdbusviewer: Focus on service tree view on service list return pressedAlexander Akulich2018-04-032-0/+18
| | | | | Change-Id: I901fb3da48fe77d7cc3edc7bad4f0f9033f2c85a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qdbusviewer: Set focus to services filter on showAlexander Akulich2018-04-032-0/+6
| | | | | Change-Id: Icbb7259c57b53560f7b9e1a6e039171debc26114 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qdbusviewer: Focus on services view on filter editor return pressedAlexander Akulich2018-04-032-0/+11
| | | | | Change-Id: I337ae8b179d00075310bbba6235652c635c73557 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qdbusviewer: Port to Qt 5 signals & slot connection syntaxAlexander Akulich2018-04-034-23/+19
| | | | | Change-Id: I23eb27bbca316fa4149983a239e38443b03647f1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qtattributionsscanner: Add test modeKai Koehne2018-04-038-9/+16
| | | | | | | | Rename test qt_attribution.json files to qt_attribution_test.json. This avoids warnings when picking up the test files in normal mode. Change-Id: I8831a81c84986c074d3519d2855c00987b4c2570 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add support for translation function aliases that are member expressionsSimon Hausmann2018-03-294-3/+25
| | | | | | | | | | | | | When traversing the AST for call expressions, it may happen that the base of the call expression is a field member expression instead of a plain identifier. For example with CustomTranslator.myTr() the base is a field member, with an identifier as base and myTr as name. We can construct a qualified name from that quite easily and this way support qualified tr aliases in qml files. Task-number: QTBUG-67278 Change-Id: I106243d8eed6d8cec75819a44942cf750de2829a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qdoc: Distinguish between undefined and defined-as-empty config varsTopi Reinio2018-03-283-3/+8
| | | | | | | | | | | | | | | | Make Config::getString() return an empty string for variables that are defined as empty, while continuing to return a null string for undefined ones. Use a defined-as-empty 'moduleheader' variable: moduleheader = to mark a documentation project that doesn't need a precompiled header to be built. Change-Id: I2ccb631c73a1b91dc35955e5f21648db88915064 Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Print absolute path for errors and warningsTopi Reinio2018-03-271-5/+2
| | | | | | | | | | | | | | QDir::isAbsolutePath() returns true for paths that begin with root dir or drive letter (on Windows). Since Clang integration, we now see warnings with paths such as /path/to/qt5/qtbase/include/QtQuick/../../../qtdeclarative/src/ [...] Remove the check for isAbsolutePath() and always construct an absolute path. Change-Id: Iea1e6f83f452abf0644968e0a5ee725829a8716e Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Don't pass -isystem to clang without setting QDOC_PASS_ISYSTEMMartin Smith2018-03-222-10/+10
| | | | | | | | | | | | This update surrounds the adding of -system parameters to includePaths with qdoc will not pass any isystem includes to clang. This update also simplifies some if statements in the help project writer by using some existing convenience functions in place of comparisons to enum values. Change-Id: I35d89501dcb51a98af6a6c3278f0f071ceb78259 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Allow shared comments for global functionsMartin Smith2018-03-221-0/+7
| | | | | | | | | | Shared comments were only allowed for functions that are members of classes. This update extends that functionality to functions in namespaces, including the global namespace. Change-Id: Ida855d8b49c6cdfa1fe900d96af9841e05a87aee Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Assistant: Don't query the database for unneeded dataUlf Hermann2018-03-223-5/+14
| | | | | | | | | If we only need registered documentations of a specific namespace we can restrict the SQL query accordingly, so that we don't have to iterate through all the results afterwards. Change-Id: I124cf16ed95e1010b8a05d8cb723c2a1f03120d4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Bump copyright yearJani Heikkinen2018-03-211-1/+1
| | | | | | Task-number: QTBUG-67185 Change-Id: I4b857e2acbf10666446379390ee55a288a2d8cd2 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Fix links in simpletextviewer example .qhp fileKai Koehne2018-03-205-56/+61
| | | | | Change-Id: I9694fd92853c15f2eecb2bdd1b9655b05940f217 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* qdoc: Fix Pyside2 documentation builds for shadow buildsFriedemann Kleint2018-03-152-10/+22
| | | | | | | | | Match interesting headers by file names in case mismatches occur between installed headers and headers in the source tree. Task-number: PYSIDE-620 Change-Id: Ie36fbd46fda38c86d88a00a992cac2fb58dd76bc Reviewed-by: Martin Smith <martin.smith@qt.io>
* Qt Designer: Fix license of ui4.cppFriedemann Kleint2018-03-141-1/+0
| | | | | | | Amends 909a00a4f3d1882eb974ad2953024c4670e2e392. Change-Id: I13a0257d221d87eb7dc668f58f3bf5faf7218a9d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* qdoc: Remove -fPIC from default options when Q_OS_WINMartin Smith2018-03-121-1/+3
| | | | | | | | | This update only adds -fPIC to the options passed to clang if Q_OS_WIN is not defined. Change-Id: I473ac14a026aecff141ab6d16e6283efe7bc5bd5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Revert the heinous sysinc hack qdoc needed for clang 3.9v5.11.0-beta2Edward Welbourne2018-03-072-34/+1
| | | | | | | | | | | | This reverts commits c95cba39a68bea4dc4c3c003e768412f0640e24f and 65d817345faf34cf9e5cc4f203b276de906fd84a. Apparently clang is now smart enough to handle its system include paths itself; and trying to "help" was causing problems. It was, in any case, a heinous hack. Task-number: QTBUG-66746 Change-Id: I485c6acddfd89f91a4b719f2e2e049ff76a61ce9 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Canonicalize include pathsTopi Reinio2018-03-061-0/+9
| | | | | | | | | | | | | | | | Resolve canonical include paths from the ones passed to QDoc from the command line and .qdocconf variable 'includepaths'. This allows adding include paths that are relative to the documentation project (.qdocconf file): includepaths = -I . which is useful for modules where we do not have a complete set of include paths provided by qmake. Change-Id: Ieaf0816e8c26857c873e4b521164c70bb1f5e5b3 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Fix stringsJarek Kobus2018-03-066-27/+27
| | | | | Change-Id: Ide8d1fb32e1e371716d5576d0f51771484463fb5 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* qdoc: Don't output undocumented QtGadgetHelperMartin Smith2018-03-021-2/+12
| | | | | | | | This update adds QtGadgetHelper to the list of names that are ignored if they are not documented. Change-Id: I58ca829d4576c390d78dcd2e0c5a3b75a9fec7de Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qdoc: Don't output undocumented functions from Q_OBJECTMartin Smith2018-03-014-18/+38
| | | | | | | | | | | | | Earlier, a test was added to qdoc to ensure that functions added to class declarations by macros like Q_OBJECT would not cause qdoc to output warnings that the functions were not documented. But the undocumented functions were still listed in the documentation. This update keeps them out of the documentation. Task-number: QTBUG-66742 Change-Id: I10014341fc7b870ef937ef7f0a303ccc301bf8b5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Don't add clang lib dir in system location to RPATHJüri Valdmann2018-02-281-1/+1
| | | | | | | | | If clang is installed in e.g. /usr/lib, then a qdoc binary built with -developer-build will try to link against libQt5Core.so in /usr/lib and not the one that's in the build directory. Change-Id: I5e0e90ec96fd1f84a4dc904a35eec994d639bc9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qdoc: Generate correct links to QML propertiesv5.11.0-beta1Martin Smith2018-02-233-2/+24
| | | | | | | | | | | | | | When a QML type is marked \qmlabstract, the documentation for its properties is included on the reference page for each QML type that inherits the abstract QML type. This means that when using the link command to link to one of these properties in HTML, qdoc must first obtain the correct file name. It was not getting the correct file name, when the link command appeared in documentation for a QML type that didn't inherit the QML type marked abstract. This update corrects that bug. Change-Id: I91ccb34e43618b7bbc1909026cbdf0c1b719df87 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
View Lorry Controller Status