summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Parse function pointer types the same way clang doesOlivier Goffart2017-08-102-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an argument to a function is itself a function, use the same representation of its type that clang uses. - Omit spaces adjacent to parentheses - The argument name is not part of the argument type. This is required so types parsed with our parser lead to the same string as libclang gives us. The only function affected in QtCore is qRegisterAnimationInterpolator. Before: void qRegisterAnimationInterpolator(QVariant(* ) ( const T & from, const T & to, qreal progress ) func) After: void qRegisterAnimationInterpolator(QVariant (*)(const T &, const T &, qreal) func) Unfortunately, this means the documentation does not contain the parameter names in the function type. We will probably have to adapt the documentation of qRegisterAnimationInterpolator() to mention the meaning explicitly. Change-Id: I00ba1854869c061fb54c6a53e6eb02b934c20459 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Use clang as a parser in qdocOlivier Goffart2017-08-1017-932/+1176
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file qt_find_clang.prf is inspired by qtcreator's clang_installation.pri. The code from the while loop in ClangVisitor::parseProperty contains code moved from CppCodeParser::matchProperty. The code in the for loop of ClangCodeParser::parseSourceFile (from the "Doc parses the comment"), is mostly moved from CppCodeParser::matchDocsAndStuff. In CppCodeParser, most of the code is removed since clang is used for parsing. We just need to leave enough to parse the declaration in the comments which still use the old parser (\fn, ...) Known issues: - When the parameter name is a comment, it is lost. (e.g. QObject::eventFilter(QObject * /* watched */, QEvent * /* event */) - I can't compute default parameters when they are expanded from a macro. (e.g. QObject::tr) - Instances of #ifndef Q_QDOC need to be reviewed Change-Id: I92d4ca4fc52810d9d3de433147a9953eea3a1802 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove declaration of non-existing methodKai Koehne2017-08-071-1/+0
| | | | | | | | | | Change-Id: I7848260ead4bf16fb922a061cb61291a0fec8df8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | lconvert: Add a -no-untranslated command line optionRobert Loehning2017-08-063-0/+18
| | | | | | | | | | | | | | | | [ChangeLog] Added option "-no-untranslated" to lconvert Started-by: hjk <hjk@qt.io> Change-Id: I79e5a67ec721c9bcd8ea25bb9ec8ad80f55a229d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qtdiag: Add basic Vulkan infoLaszlo Agocs2017-08-033-1/+56
| | | | | | | | | | | | Task-number: QTBUG-62282 Change-Id: Icf7aa9b6f5f4f21da2dacb99c9f4b8f6b9b9eca7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Remove individual QMAKE_TARGET_PRODUCT'sKai Koehne2017-07-263-3/+0
| | | | | | | | | | | | | | | | It's been a while since we marketed either of the tools as separate products. It's all "Qt5" now. Change-Id: Id9ef7cfb217978039725d079da9a86043aed990a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Win: Set proper descriptions for toolsKai Koehne2017-07-2612-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is shown in the file properties and in crash dialogs. Because of the latter, a short name is better than a description, otherwise you get dialogs like Tool for viewing on-line documentation in Qt help file format has stopped working. Task-number: QTBUG-61970 Change-Id: I9289fe9546a6d9056bbfddb2b6c0bb0ae94684c2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove dubious QMAKE_TARGET_PRODUCT, *_DESCRIPTIONKai Koehne2017-07-211-4/+0
| | | | | | | | | | | | | | | | This is a library, so the defaults should be fine. Change-Id: I03a663ce62a8f2604ed01454cb5824a4d341c080 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-068-41/+86
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10c51b1983bcc48043b89b9aac9780da311ff802
| * windeployqt: Add missing \n to warning messageJoerg Bornemann2017-07-051-1/+1
| | | | | | | | | | Change-Id: Ia761dcdfb35d0439bfd60ba1fd0c56ce44ea45f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * windeployqt: Make --no-translations work for QtWebEngineJoerg Bornemann2017-07-051-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The --no-translations option was deliberately ignored for QtWebEngine, because of crashes when translations were missing. The crashes have been fixed, but QtWebEngine still expects at least one translation file. Otherwise it will warn in the debug log. Now, when passing --no-translations only the en-US.pak translation file will be deployed. Task-number: QTBUG-51658 Change-Id: I767cf74c728e51bed30a94c47948f27f9b801999 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-23/+48
| |\ | | | | | | | | | Change-Id: I590e937321b652bf15317b28a5601aa4e3926556
| | * windeployqt: Deploy MSVC2017 redistributable filesv5.9.15.9.1Friedemann Kleint2017-06-231-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | Factor out a function looking for the files. Task-number: QTBUG-61549 Change-Id: If6938d67d479e85655937465670bb72b50a44650 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | windeployqt: Print missing modules in warning about disabled pluginsFriedemann Kleint2017-06-281-3/+6
| | | | | | | | | | | | | | | Change-Id: Ice8b793c25ee1b57256a175d19a4314530b1f136 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Qt Designer: Fix shrinking row span of QGridLayout itemsFriedemann Kleint2017-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, shrinking a row span by moving the bottom widget handle up did not work due to the code checking the width of the item. Correct to check on the height when creating the command. Change-Id: Ieb1cf7eb0e78bb2edba7f2a7d7ff920f28ada509 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | QDoc: End "This function is reentrant" with a dotKai Koehne2017-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | Fix \reentrant, \threadsafe output for functions. Change-Id: I192ed48a292ccf7ffcc87b8422ba1f185d9d6629 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | TextFinder: Improve code and documentationKai Koehne2017-06-222-8/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-61419 Change-Id: Ib00152f0a04546d275a40a5d57fe046b82ebc421 GPush-Base: 8abb03b0d84a3a94f7db41e010f69955488ea893 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Fix qdoc documentation about \eKai Koehne2017-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The \e command was actually applied, which showed "Used for italics". Anyhow, I find the sentence redundant ... Change-Id: I31e8e10d7ee2f00b77ca174b498d5dac029f71be Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Add Examples link to UiTools overviewKai Koehne2017-06-201-0/+5
| |/ | | | | | | | | | | Task-number: QTBUG-61419 Change-Id: I29796201eb5b77a0c49074d1173e6e30f816f2c3 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Set the default QPA platform to minimal for the qcollectiongeneratorAndy Shaw2017-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | Since the minimal platform is used for the qcollectiongenerator this should be set in the pro file to ensure it will still work when this is statically built. Task-number: QTBUG-60926 Change-Id: I75481fe2600aecd573a429b9b9d6ec6acb803e6c Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | qdoc: Further improve example file listingTopi Reinio2017-07-043-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where '\generatelist examplefiles' with no second parameter produced an empty list, instead of listing all files. Also, no longer restrict the searching of example image files to the images/ subdirectory. All images under a project directory are now listed, except those under doc/images. Minor fixes to related QDoc documentation. Change-Id: Id4516ba2feb98466a0e893a85f85118e3d21eae2 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | qdoc: Improve example file listingTopi Reinio2017-06-266-14/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the end of \example documentation page, qdoc lists all the files that are part of the example project. This commit does the following improvements: - Sort the example files based on path name - Introduce '\generatelist examplefiles [regexp]', which lists the files (optionally, only those that match regexp) at the specified location. - Enable \noautolist for example pages, to skip generating the the file list at the end. Change-Id: Ic9ae70f9f7de166d314ae489a7bab9a935949fc3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove unused use='required' attributesJarek Kobus2017-06-201-37/+37
| | | | | | | | | | Change-Id: I7ac4c78d9b783c7c3beb7053237c3c6f6e58a52e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Ignore deprecated elements instead of raising an errorJarek Kobus2017-06-164-8/+50
| | | | | | | | | | Change-Id: I2fb1b9f08e9123e62c1a80780ce6f47dc7d3d25d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Simplify DomUI classesJarek Kobus2017-06-167-2640/+510
| | | | | | | | | | | | | | | | | | | | | | | | Generate text/setText methods only for "mixed" elements, other elements don't use this API. Remove unused DomScript, DomImages, DomImage, DomImageData, DomProperties, DomPropertyData, DomSizePolicyData, DomWidgetData. Use default constructors and in-class initialization. Format newlines. Change-Id: Ic91c797de68710cabc36db1e99bdf82332107ebc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Qt Designer: Refactor signal dialogFriedemann Kleint2017-06-085-105/+354
| | | | | | | | | | | | | | | | Replace the 2-column list by a tree populated in reverse inheritance order with the methods sorted alphabetically by class. Change-Id: I582ff3f98a45ec8b71b75338f9d601d16ab5491d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0894-1450/+1518
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/windeployqt/main.cpp Change-Id: I2256565a75b8e1c63ef5aeb34fecb6929f94a1f1
| * Fix unmarked case fallthrough detected by GCC 7Thiago Macieira2017-06-061-1/+2
| | | | | | | | | | | | | | helpviewer_qwv.cpp:97:33: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c4871dfbf13a14 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * Fix GCC 7 warnings about unmarked case statement fallthroughsThiago Macieira2017-06-042-2/+5
| | | | | | | | | | | | | | doc.cpp:632:39: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c48709a6772552 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * qtdiag: Show more useful information about styles and platform themesThiago Macieira2017-06-032-5/+17
| | | | | | | | | | | | | | | | | | Only listing the names that we're requesting is misleading. It does not show actual capability. Instead, show both what we're requesting and what is available. Change-Id: I0e1a09998253489388abfffd14b5f0eb4315ab77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * windeployqt: Determine name of ANGLE libraries by existenceFriedemann Kleint2017-06-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | Previously, the name was determined by checking the dependencies of QtGui, which are not present in the dynamic GL case. Replace by a check for the file name. Task-number: QTBUG-60962 Change-Id: I8778dc0d03808f88ed8f5dc6b3ca4acd22aae3ae Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix enablement of search result widget arrowsJarek Kobus2017-06-011-76/+25
| | | | | | | | | | | | | | Enable also the search result label. Change-Id: Iea35c30eaef0af27302f036f987de757b98379b8 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into ↵Liang Qi2017-05-314-22/+38
| |\ | | | | | | | | | refs/staging/5.9
| | * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-314-22/+38
| | |\ | | | | | | | | | | | | Change-Id: Idb412afb4f444ac57a5fadc907e12c58ab299d9a
| | | * windeployqt: Unconditionally deploy all files of Quick Controls 1v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Friedemann Kleint2017-05-221-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files are added to resource files only in the case of static builds; so, for Windows UWP 64, for which QML caching is disabled, they were missing. Task-number: QTBUG-60536 Change-Id: Idb795f71441ab1bfbc1cdbc53a322ee9e86e54bc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Move the linksForKeyword from QHelpModelIndex to QHelpEngineCoreJarek Kobus2017-05-093-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete it inside QHelpModelIndex. Change-Id: I11f1e67c6eac6e6790a7c73d5850f5b415214db1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| | | * Revert "windeployqt: Remove deployment of libglesv2 and libegl"v5.9.0-beta4Friedemann Kleint2017-05-051-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back the autodetection of ANGLE as the naming now depends on configure switches. This reverts commit fc8b7d36291611aebdc344f2e26a992da0003bbc. Task-number: QTBUG-60373 Change-Id: I14826cd1730fddb203e9a7c98b76d7def7388d9c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | windeployqt: Add Qt5GamePad with pluginsFriedemann Kleint2017-05-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-61127 Change-Id: I66681129b3bbdc1b37e3c17b4e70ac4ee17bb7f3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | windeployqt: Refactor the plugin - module lookup to use an arrayFriedemann Kleint2017-05-311-34/+40
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-61127 Change-Id: I31cb3dad0a11add87d51943534ae572b4c50bfe3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Add missing break in switchThiago Macieira2017-05-301-0/+1
| | | | | | | | | | | | | | | Change-Id: I9bf1e35bffb044dcbf62fffd14bfecea5bdaff2a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | remove bogus QTPLUGIN+=qsqlite magicOswald Buddenhagen2017-05-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code was originally meant to link the plugin if it's not built into qtsql. this logic did not survive the various build system refactorings, but it's also entirely pointless, because available static plugins are now automatically linked. Change-Id: I5e45798a2e3cdddb8aa6fc7c283f023cf4d2c2c9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Qt Designer: Fix crash in "Go to slot" dialog when no signal is selectedFriedemann Kleint2017-05-291-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add a check for the selection. Task-number: QTBUG-61009 Change-Id: Ic99d8ca2b9b838b2cb24f1cf4b259c38e2a6f1ca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Revert "androiddeployqt: don't include plugins that are not necessary"Shawn Rutledge2017-05-261-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4f6d0ee8743f57d29e6f1fd13440c7242bea6134. It prevented some files in QtQuick.Controls 1 and QtQuick.Dialogs from being deployed, and the result was that Dialogs could not be used at all. Task-number: QTBUG-60918 Change-Id: Id2bb8edba54b0dd1c29ab558690db3c342aa8ee7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oleg Yadrov <oleg.yadrov@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | Deploy the iconengines with the applicationAndy Shaw2017-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iconengines should be deployed automatically since they could be used by the application without needing to explicitly include their dependency in the application. This brings it in line with what windeployqt does too. [ChangeLog][Platform Specific Changes][macOS] iconengines are deployed with the application when using macdeployqt. Task-number: QTBUG-59609 Change-Id: I7fd3bf9d55d2979f30a2ad7959a6a31919d49c8c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | Fix GCC 7 warnings about implicit fallthroughsThiago Macieira2017-05-193-5/+6
| | | | | | | | | | | | | | | | | | | | | Make them explicit. Change-Id: I9bf1e35bffb044dcbf62fffd14bfecd847104fef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Fix build break when qreal is defined as floatTomasz Olszak2017-05-041-1/+2
| | | | | | | | | | | | | | | Change-Id: I99725764995111a7eee9c70f5b10fabcb54b3c0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Fix the build with qtwebkitJarek Kobus2017-05-043-13/+13
| |/ | | | | | | | | Change-Id: I26459d44fb7bd0dc6e98f073984ee0ff04b945d6 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * disarm webkit use in assistantOswald Buddenhagen2017-05-041-1/+2
| | | | | | | | | | | | | | | | that configuration is currently broken. Change-Id: Ia35ba4d0b90687db26a0bb6f664df01e1ed1490a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix licensingJani Heikkinen2017-05-0311-132/+165
| | | | | | | | | | | | | | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one - Switch old LGPL3 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: I36a5b5b823cede544f43ac8349b5db27f8df6abc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * winrtrunner: Switch default target from phone to local deploymentOliver Wolff2017-05-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | Phone is no longer the main use case for winrt applications, so that local deployment is a reasonable default. Changing the default to local deployment means, that calling winrtrunner witout "--profile" or "--device" will run the given executable locally. This new behavior will help during the first phase of bringing winrt autotests into CI. Change-Id: Id67e1ddd4e994c57402e60e5ba2db79f9a25653f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
View Lorry Controller Status