summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: WebXML: Generate output for text page nodesv5.13.0-beta1Topi Reinio2019-03-111-1/+3
| | | | | | | | | Previously page (doc) nodes as well as example pages were aggregates. They no longer are, so we have to check against that specifically in order to generate output for them. Change-Id: If697104f62e3cb8de6caeb7ee758891ebf2fd077 Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Remove trailing commaMartin Smith2019-03-061-1/+1
| | | | | | | | | QML method and signal signatures were written with an extra comma. This update removes that extra comma. Change-Id: Iebe553e5a4438992b0115c8cafb0ffc7fb82b672 Task-number: QTBUG-74010 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Qt Designer: Fix deprecation warningsFriedemann Kleint2019-03-042-5/+6
| | | | | | | | | shared/previewconfigurationwidget.cpp:268:34: warning: ‘DirectoryOnly’ is deprecated: Use setOption(ShowDirsOnly, true) instead [-Wdeprecated-declarations] dlg.setFileMode(QFileDialog::DirectoryOnly); shared/qttoolbardialog/qttoolbardialog.cpp:1139:31: warning: ‘TextColorRole’ is deprecated [-Wdeprecated-declarations] Change-Id: Ia989156baf35c2be6f763c067da9440d0b2c7dee Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-021-0/+10
|\ | | | | | | Change-Id: Id06ccca252abc84720b18909f55019266426eb97
| * macdeployqt: Deploy the platforminputcontext plugins and vkb pluginsAndy Shaw2019-02-271-0/+10
| | | | | | | | | | | | | | | | | | When the gui module is used then the platforminputcontext plugins should be deployed. Additionally if that includes the virtualkeyboard plugin then those should also be deployed with it. Change-Id: I2787792e91a9cfe3603a4e2e29273f682942bf36 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Use QVersionNumber for version instead of QStringJarek Kobus2019-03-0110-35/+67
| | | | | | | | | | | | Change-Id: Ib44d3965f45272f7b791f1d164b0901d170c239d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Rename QHelpCollectionDetails into QCompressedHelpInfoJarek Kobus2019-03-014-52/+54
| | | | | | | | | | | | | | Fixes: QTBUG-74082 Change-Id: Ifbcb9076d2884f78f16b9d80859551c37c73954f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Remove setters for QHelpCollectionDetailsJarek Kobus2019-03-012-31/+3
| | | | | | | | | | | | Change-Id: If83486ad7c746beed79f3bd45da7d8ba832f25cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Add documentation about the QHelpCollectionDetailsJarek Kobus2019-03-011-0/+63
| | | | | | | | | | | | | | Change-Id: I6d3ff3cd13da201bc716b7bda7b1affda03fb323 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix filtering in case when using empty optionJarek Kobus2019-03-011-2/+4
| | | | | | | | | | | | | | | | It may happen that version or component value is empty for a specific documentation. Make this case work. Change-Id: I7133f1554d2fe72e3b9a4731e80245ceb051e596 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Make no option and invalid option texts customizableJarek Kobus2019-03-013-6/+51
| | | | | | | | | | | | | | | | | | This influences the preferences dialog, as now there will be "No version" and "No component" text displayed instead of one general "No option". Change-Id: I62da44fbb78f5f11c82d59dd5acf55868a8ec443 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Create default version filterJarek Kobus2019-03-012-3/+23
| | | | | | | | | | | | | | | | | | This mimics the behavior of old filters, where in 98% of use cases the qch file provided a separate filter for its module. Change-Id: I537d8336ea3cc0c6c894b494d7f2346df7499572 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix handling of current filter rename and removalJarek Kobus2019-03-011-3/+12
| | | | | | | | | | | | | | | | | | After renaming the current filter in preferences and applying changes, rename the current filter properly in the help engine. Change-Id: I5a70171b494b50b30f1d95a8cce05acd0f5c3b8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Enhance filtering by documentation version numberJarek Kobus2019-03-0114-38/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to filter the documentation by version number. This easily allows for showing the docs for one or more specified versions inside a custom filter. Task-number: QTCREATORBUG-19724 Task-number: QTCREATORBUG-7301 Change-Id: Ia0bc63666ab8152e43ffb6a6b6b99610e30575f7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | qdoc: Fix duplication of nodes in index filesTopi Reinio2019-02-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Aggregate class maintains a QMap of child nodes that is used for searching. PageNode entries may be added in the map multiple times, both with name() and title() as the key. When returning a list of non-function children, duplicates are now removed. Task-number: QTBUG-74009 Change-Id: I7e5df359313a53fa3b5bc4f9efa6e3ac6ea11eab Reviewed-by: Martin Smith <martin.smith@qt.io>
* | QtHelp: Make QHelpCollectionDetails destructor virtualKai Koehne2019-02-261-1/+1
| | | | | | | | | | | | | | | | | | Class is not final, nor do we prevent inheritance in any other way. This amends 7c39470f17, which got added for 5.13. Change-Id: Idbf82b58e5bd54b21ec2615cb2ebdc6cb5ece4a8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QtHelp: Add move operators to QHelpFilterData, QHelpCollectionDetailsKai Koehne2019-02-264-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add move constructors and move assignment operators to QHelpFilterData, QHelpCollectionDetails. Both classes are implemented in terms of a QSharedDataPointer, which offers a move constructor and move assignment operator, so it makes sense to just 'export' this to the class API. In addition, let the compiler create the implementations of the normal copy constructor and assignment operator. Change-Id: Id2d8a86b0b1e0a2e75fec989ae1f5442ead50410 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QtHelp: Remove unused forward declarationKai Koehne2019-02-261-1/+0
| | | | | | | | | | | | Change-Id: Icf81ff0c3fb4e811f58a809bc01d6599a1f00b2c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Rename helpDetails to fromCompressedHelpFileJarek Kobus2019-02-263-3/+3
| | | | | | | | | | | | | | Task-number: QTBUG-73738 Change-Id: Id5ecec6fba37127032bf3f002a720615ccc18288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Application icons refreshAlessandro Portale2019-02-2120-0/+0
| | | | | | | | | | | | | | | | | | | | This change replaces the existing application icons with the newly designed ones. Task-number: QTBUG-70826 Change-Id: I4bd2c4116014eac4b0ac16efba28d50f4da936eb Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | qdoc: Fix duplicate section headers on C++ reference pagesTopi Reinio2019-02-191-5/+0
| | | | | | | | | | | | | | | | | | While merging commit 4367cf31 from 5.12 to dev, a section of the code that was supposed to be deleted was left around. This caused duplicate <h2> headers and in some cases, invalid HTML output. Change-Id: I6f535391a06eced97ebd5c03b45ffb2b10f0a89b Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-192-3/+6
|\ \ | |/ | | | | Change-Id: If9dc5f167e9471b4633db73ae5a1cb8c1312b478
| * macdeployqt: Deploy QtSpeech tts pluginSamuel Gaist2019-02-121-1/+2
| | | | | | | | | | | | | | This patch adds deployment of the QtSpeech plugins. Change-Id: Ifc55f40cdc0ed6fd9444993c04f4d76249649daf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * qtattributionsscanner: Add version to third-party component nameKai Koehne2019-02-121-2/+4
| | | | | | | | | | | | | | | | This is information important enough to show up in the title, and therefore also in the overview pages. Change-Id: I4bad7b46e186e34133a8a3cebe0c68cebec0e76c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qdoc: Improve function overload handlingTopi Reinio2019-02-132-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QDoc calls Aggregate::normalizeOverloads(), process \internal function nodes last. This ensures that they get assigned overload numbers higher than the public ones, and adding internal overloads no longer shuffle around the public HTML anchors (that are based on the overload numbers). Also, when searching for functions, ensure that we don't return an \internal overload if a matching public one exists. This gets rid of a number of linking warnings. Change-Id: Idaac077e2f88d310e3261bf5b4c3df33ca02f873 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Add <sys/wait.h> include to fix build of FreeBSDAndré Klitzing2019-02-131-0/+4
| | | | | | | | | | | | | | | | ../shared/runqttool.cpp:96:16: error: use of undeclared identifier 'WEXITSTATUS' exitCode = WEXITSTATUS(ret); Change-Id: I96aa0324f3749702323217e5cf7f7570c80424a2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-122-7/+12
|\ \ | |/ | | | | Change-Id: Iff999e458326e9d620895f9e799a64c06a12185e
| * qdoc: Add complete version string to the HTML titleVenugopal Shivashankar2019-02-111-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typically, most developers will have a setup with multiple versions of Qt installed, such as 5.12.0 and 5.12.1. This means that there will be several versions of the same document installed. For example, when a developer tries to search for 'Item' keyword in the Qt Creator help mode, they will be presented a list of two topics to choose from; one each for 5.12.0 and 5.12.1. Unless the HTML document includes patch version info in the title, it is hard to differentiate between to two topics in the list. Task-number: QTBUG-73620 Change-Id: I183bf6476f57d65cf2bcae52289dcb4779a87caf Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Make windeployqt cross-platform (again)Marius Kittler2019-02-061-0/+7
| | | | | | | | | | Change-Id: I58d3d37fcc4d9da5879000e999707b007c4a7b39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QtTools: replace deprecated QLayout::margin() with contentsMargins()Christian Ehrlicher2019-02-1134-49/+49
| | | | | | | | | | | | | | | | QLayout::margin()/setMargin() is deprecated - replace it with it's successors contentsMargins()/setContentsMargins() Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QtTools/designer: replace deprecated functionsChristian Ehrlicher2019-02-113-5/+6
| | | | | | | | | | | | | | | | | | | | | | Replace deprecated functions: - QFileDialog::setConfirmOverwrite() - QFileDialog::setResolveSymlinks() - QAbstractItemDelegate::elidedText() - QGraphicsProxyWidget::matrix() Change-Id: Ib50310f0e4652c57ee6965c21e80d76f94ab987d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix warning about ambiguous else (inside the foreach macro)Thiago Macieira2019-02-111-2/+4
| | | | | | | | | | | | | | | | | | messagemodel.cpp:435:12: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else] Might as well change to range-for. Change-Id: Id061f35c088044b69a15fffd15818f8a10e64064 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Pixeltool: Fix deprecation warnings about QDesktopWidgetFriedemann Kleint2019-02-091-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | qpixeltool.cpp:60:64: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qpixeltool.cpp:63:65: warning: ‘int QDesktopWidget::screenNumber(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations] qpixeltool.cpp:65:56: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qpixeltool.cpp:506:75: warning: ‘int QDesktopWidget::screenNumber(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations] qpixeltool.cpp:552:51: warning: ‘int QDesktopWidget::numScreens() const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qpixeltool.cpp:553:54: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] Change-Id: I717ee36c214c0fc3dd76550316068c76e849950f Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | QDoc: Code cleanup, use nullptr for nullptr constantsPaul Wicking2019-02-0829-383/+383
| | | | | | | | | | | | | | | | | | | | Replace 0 as nullptr constant with nullptr. Remove reduntant semi-colons after member function definitions. Adjust whitespace on lines otherwise touched. Change-Id: I6af218ca8377611040360e0a3da392e7cffd29e9 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QDoc: generate proper html for example source file pagesPaul Wicking2019-02-084-10/+34
| | | | | | | | | | | | | | | | | | | | Source for examples are put into html files that are linked to from the example page. In 5.12 these html files contained the doc site header, footer, and proper styling. This behavior is restored with this change. Change-Id: I23254366e4f85d348ed1bf7af5175334920cd672 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | qdoc: Correct ref pages for inner classesMartin Smith2019-02-0819-193/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update corrects the documentation pages for classes, structs, and unions that are declared inside a class or a struct. In Qt, a struct is often declared inside a class. For such internal declarations, the requirements for making the inner entity available were incorrectly shown. All that is really necessary is to include the parent class. So the requirements for including the inner entity are now replaced with, for example, "Struct State is declared in class QAccessible," where QAccessible becomes a link to the reference page for that class. It was easier to implement this change by teaching qdoc to recognize structs and unions in addition to classes, so that is also included in this change. Change-Id: I1a0d46ef19a130506c7bcbf77b46e298f6ab2f71 Task-number: QTBUG-66872 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | QDoc: Fix links to images used in examplesPaul Wicking2019-02-081-1/+2
| | | | | | | | | | Change-Id: I2603288d8baed5574ffb8d199b96e0c42672c0d4 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | QDoc: Make entries in config.log more explanatoryPaul Wicking2019-02-081-1/+2
| | | | | | | | | | Change-Id: Ia4b10e3031c74ffdc155769a23503cca7ee2e15e Reviewed-by: Martin Smith <martin.smith@qt.io>
* | qdoc: Major clean-up of FunctionNode and parameter processingv5.13.0-alpha1Martin Smith2019-02-0632-2998/+3280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update was motivated by the need to correct two known issues in qdoc. First, linking to overloaded functions failed in some cases because the overloads were not numbered consistently, causing links to go to the wrong overload or to nowhere at all. Second, the mechanism for handling the \relates command didn't support using it to relate a function to more than one class. For example, there are many global qHash() functions spread around QtBase. Each is meant to compute a hash index for an object of some class type, so the object can be inserted into a QHash map for that class type. It is then desired to relate qHash(type Xxx, int seed) to both QHash<type> and class Xxx, so that the documentation for that qHash() function appears as a related non-member function of both QHash<type> and class Xxx. The example above also illustrates the overload numbering problem, because all these qHash() functions are overloads of the name qHash. To make matters worse, they are not all in the same module. Most of them are in QtCore, but a few are in QtNetwork, and this distribution problem will become worse over time as more qHash() functions are added. Prior to this update, qdoc was unable to relate a function to something in a different module, or it didn't always work. While designing a fix for these issues, it became clear that the processing of the FunctionNode and the function parameters would have to be rewritten. That's what this update does. These are the main points: 1. A new subclass of Node is added to act as a proxy for a class in another module. This ProxyNode acts as a place holder for the functions (and possibly other elements) that are related to a class in another module. This is used for the qHash() functions in QtNetwork that are related to QHash in QtCore. qdoc generates an html file named qtnetwork/qhash-proxy.html that contains the documentation for these functions. But these functions are listed as related non-members on the QHash class reference page in the qtcore output directory. They are listed there in the summary, but they link to the qhash-proxy.html page in qtnetwork. 2. A new, Parameters class is added to qdoc (parameters.h and parameters.cpp), and the class Parameter is moved there from node.h. class Parameters replaces the old QVector<Parameter> wherever it was used. This encapsulates all the parameter processing and matching in the Parameters class and simplifies the code at all the places where QVector<Parameter> had been used. 3. The assignment of overload numbers is now done in the normalizeOverloads() function, which is called after all the headers and sources have been processed but before the generate phase begins. This assignment is a simple renumbering now because all the overloads of a function are linked to each other via a nextOverload_ link in the FunctionNode. The first function named qHash() is inserted into the Aggregate node's function map, but subsequent qHash() FunctionNodes are not entered into the function map but are linked to the first qHash() via its nextOverload_ link. 4. The \relates command can now be used multiple times in a single qdoc comment. There remains some work to be done here because this currently only works for global entities, but there are several cases where \relates has been used in the qdoc comment of a member of a class. This will be fixed soon, I believe. When qdoc sees the first \relates Xxx command, for example for qHash(Yyy, seed), that qHash() is a child of the global namespace. qdoc allows it to remain as a child of the global namespace but it tells class Xxx to "adopt" that child (see Node::adoptChild()). This function makes this instance of qHash() be a child of class Xxx (in this case QHash<type>), so that the parent of this qHash() becomes Xxx. After this "adoption," qHash() is a child of both the global namespace and class Xxx, but qHash() only knows it is a child of Xxx, i.e. its parent pointer is Xxx. If this is the first qHash() to become a child of Xxx, it is inserted into the function map of Xxx, but its nextOverload_ link is not changed. This is because all the global qHash() functions have already been linked into the nextOverload_ linked list, and this list must not be changed. Hence, when qdoc searches for qHash(something) to make a link to it, it will find it as a child of the global namespace, but it will correctly link to it using its actual parent pointer. When qdoc sees the second \relates Yyy for this qHash() function, qdoc sees that this FunctionNode has already been made a related non-member of Xxx, so it can't let Yyy "adopt" it. Instead, it tells Yyy to clone this qHash(), which creates a shallow copy of it but resets its nextOverload_ pointer to nullptr. I believe this clone of qHash() won't be found in a search for a function named qHash(), because the global one (the adopted one) will be found first. Or, if it is found, a link to the clone will be generated, but that's ok because the documentation is identical. Note that the existence of qHash in two child lists is taken into account at destruction time. The only place where a Node is destroyed is in the destructor of Tree, which destroys the Node tree from the root down to the leaves. Each aggregate node is responsible for deleting each of its child nodes, but it only deletes a child node if it is the parent of that child node. All of the above revealed that some of the findFunctionNode() functions were either no longer needed or weren't being called in the first place, so they were deleted. This change is now ready for testing. Change-Id: I6da3e2e9e71d39a29d90e073ed614309a49e3d4c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix deprecation warningsFriedemann Kleint2019-02-0515-26/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtpaths.cpp:114:19: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] qtpaths.cpp:218:21: warning: ‘static void QStandardPaths::enableTestMode(bool)’ is deprecated [-Wdeprecated-declarations] aboutdialog.cpp:144:81: warning: ‘const QRect QDesktopWidget::availableGeometry(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations] qtdocinstaller.cpp:66:70: warning: ‘QDir& QDir::operator=(const QString&)’ is deprecated: Use QDir::setPath() instead [-Wdeprecated-declarations] optionswidget.cpp:187:32: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] optionswidget.cpp:116:25: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] mainwindow.cpp:219:70: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] mainwindow.cpp:727:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] qdesigner_workbench.cpp:272:81: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qdesigner_workbench.cpp:577:51: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qdesigner_workbench.cpp:586:83: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] appfontdialog.cpp:355:41: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator) [with RandomAccessIterator = int*]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations] mainwindow.cpp:263:75: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QToolBar**; LessThan = bool (*)(const QToolBar*, const QToolBar*)]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations] shared/qdesigner_menu.cpp:175:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_toolbar.cpp:406:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/actionrepository.cpp:321:33: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_menubar.cpp:316:35: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_tabwidget.cpp:220:73: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] Change-Id: I78d288be2e061dba03cbe72a77ca3b9742f79111 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | makeqpf: migrate to QRegularExpressionSamuel Gaist2019-02-051-8/+12
| | | | | | | | | | | | | | | | | | | | This patch updates makeqpf's code to use QRegularExpression in place of QRegExp which is to be considered deprecated. Task-number: QTBUG-72594 Change-Id: I9ee0478e64377460f1ae33f96d0613b44a6b2011 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-051-1/+1
|\ \ | |/ | | | | Change-Id: I917230d04b8d88bb8e18982680795f7b75080073
| * Disable qtdiag on WebAssemblyEskil Abrahamsen Blomfeldt2019-02-041-1/+1
| | | | | | | | | | | | | | | | | | We are getting a compiler error for this, and it does not make sense on a GUI-only platform. Task-number: QTBUG-73463 Change-Id: Id7bf3ba2f51849e5ec88c86fe35f061b0175f7b9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Document CodeChunk in its .cpp file, rather than its .hMartin Smith2019-02-042-22/+36
| | | | | | | | | | | | | | | | | | Add documentation for two methods and fix a typo in the class comment. Change-Id: I3ba6d0d0307f3c1e581d68b1fb3e1c43a1566525 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2832cc2dbc55122fe217e4c309f437fd237c1ba6)
* | Inline CodeParser::processCommonMetaCommand() in its one callerMartin Smith2019-01-303-101/+62
| | | | | | | | | | Change-Id: Ia715d6f5685363e4ccc22172ea45e43f1da72a17 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Tidy up CppCodeParser::parseMacroArg() and clarify its documentationMartin Smith2019-01-301-42/+44
| | | | | | | | | | | | | | | | | | An early return lets it declare its returned pointer later and a terser name for this variable is entirely sufficient. (This also prepares the ground for changing its return type and de-virtualising.) Change-Id: Ia94d810d341535d2d81aa28820696bfb2eec1652 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Skip NULL nodes when processing meta-commandsMartin Smith2019-01-291-11/+16
| | | | | | | | | | | | | | | | | | Add a missing null-check to a loop over nodes. Tidied up handling of the case where the node is an Aggregate, in the process. Change-Id: Iec39efdc9565c730baa8e0118de7cef50acd84f8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | QDoc: Further improvements to libclang detectionPaul Wicking2019-01-282-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | In cases where llvm-config was installed without libclang-dev, the llvm-config candidate detection happily proceeded with the first version it found. This change improves on this by checking if the candidate also has clang-c/Index.h (our dependency). This change also adds llvm-config-8 as candidate for locating libclang, and tidies up some of the log messages from configure. Change-Id: I2746c5f427279ab38db4b20a123b695ecaebd1e9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-267-45/+55
|\ \ | |/ | | | | Change-Id: I4934e083cec185981081f8192c0f044d40961894
| * linguist: Replace splash screen image with 128px application iconAlessandro Portale2019-01-254-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The "splash screen"/"about linguist" image consisted of a custom-made image with an embedded application icon. Due to the high frequency of changing Qt logos and application icons, this became a maintenance burden. This patch replaces that custom-made image with the 128px application icon. Change-Id: I990d57f7866abcafdb67a21173357b0ad5c6a01e Reviewed-by: Kai Koehne <kai.koehne@qt.io>