summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-026-5/+26
|\ | | | | | | | | | | | | Conflicts: src/qtattributionsscanner/main.cpp Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44
| * qdoc: Handle Module, QmlModule nodes in Generator::typeStringKai Koehne2018-01-241-0/+4
| | | | | | | | | | | | | | Fixes output of \since, \preliminary if associated with a module. Change-Id: I760963135283d4978225e2ad72f3c0c6df852e56 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * qtattributionsscanner: Always write UTF-8 filesKai Koehne2018-01-231-0/+2
| | | | | | | | | | | | | | Both JSON and qdoc output files should be generated in UTF-8. Change-Id: I7d60d9042bcc1e8d69e164691fcc4129d4e95fb6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * macdeployqt: Implement selection of file system for .dmg fileSamuel Gaist2018-01-233-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With macOS High Sierra, Apple machines using SSD see their file system changed for APFS automatically. hdiutil by default uses the current file system to build the dmg file which in this case makes them unusable on older version of macOS that don't have support for APFS. This patch adds an additional option to macdeployqt to select the file system to use when building the .dmg. It defaults to HFS+ which was the official file system used until now for all currently supported version of macOS. [ChangeLog][macdeployqt][feature] Added support for selecting the file system type to use when building a .dmg file. Defaults to HFS+ to support a wider range of macOS versions. Task-number: QTBUG-65844 Change-Id: Ic66856344f96c6536b224d13d309715b34eb0874 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * Doc: Fix Qt Help license informationKai Koehne2018-01-221-2/+3
| | | | | | | | | | Change-Id: Idbaae38cc24e36f1309995bf7c4f47a41c08db5c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-186-15/+54
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia803aad211281c71a8d13b403d83fb5ec3b2cb2c
| * windeployqt: Add deployment of the Qt3DAnimation dllSamuel Gaist2018-01-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | Windeployqt currently doesn't deploy the Qt3DAnimation dll when the module is used. This patch fixes this. [ChangeLog][Windows][deployment] The Qt3DAnimation dll is now deployed when the module is used. Change-Id: Ibff744192f6a3e028bb096e33f596cba948b229b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * winrtrunner: Do not close handle twice for local appsOliver Wolff2018-01-051-2/+0
| | | | | | | | | | | | | | The handle is closed in AppxEngine's destructor. Change-Id: If672f247537d57705cc18b70e3e5842fca40cb4c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Assistant: ensure bookmarks are persistently stored when changedEirik Aavitsland2017-12-142-1/+28
| | | | | | | | | | | | | | | | | | | | | | The bookmark manager would only update the persistent storage in its destructor. Since that is not called on an unclean process termination, bookmark changes would be lost. Fix by updating the persistent storage after every bookmark change. Task-number: QTBUG-50350 Change-Id: Id03d5ea96df15d01fdf482203aaf1db7166a7036 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Assistant: Fix search results for content in .txt filesEirik Aavitsland2017-12-121-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The search index writer would treat all input files as html. This led to .txt files being stored with empty titles (no <title> tag would be found). That again led to unusable search results in Assistant, showing only the snippet, but no clickable title link. Fix by special casing for .txt files, using the file name as title, just as QHelpGenerator does. Task-number: QTBUG-62250 Change-Id: Id82a780dadc2d4ff5866a565337f86c798b952a5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * windeployqt: Fix deployment of MSVC 2017 15.5 release redistributableFriedemann Kleint2017-12-091-3/+6
| | | | | | | | | | | | | | | | The file name was changed. Task-number: QTBUG-65015 Change-Id: I0a81a42abae3bcf9b124acbea55ba4e275594016 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Fix qt5_add_translation macro to return correct file namesMartin Leutelt2017-12-051-3/+5
| | | | | | | | | | | | | | | | | | | | | | The CMake macro now determines the file names of the given ts files correctly when a file name contains multiple dots. Instead of using the first dot to identify the file extension now the last one is used. Task-number: QTBUG-64317 Change-Id: I9a8423307679fb722fb4b0bc2f0af19f0f7ee821 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
| * windeployqt: winrt: Do not list translation files that are not deployedOliver Wolff2017-11-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | Visual Studio projects for winrt usage rely on a proper list of files that are deployed. We concat translation files into a single qt_<prefix>.qm file using lconvert, but also mention every "sub file" (qtbase_<prefix>.qm etc) in json. That breaks deployment on winrt and thus should not be done on that platform. Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Open PDF files externally instead of inside AssistantAndy Shaw2018-01-161-2/+2
| | | | | | | | | | | | | | | | | | Since Qt Assistant no longer uses Qt WebKit then we need to open the PDF files externally to ensure that they are shown. Change-Id: If659c15524e106c9974ead144afe2048452a4c22 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qdoc: Always set the URL for nodes read from indexTopi Reinio2018-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Items written to index have the URL attribute set, but qdoc only used it if it was able to resolve the relative index URL. If the documentation was generated using a single-directory output config, the relative index URL is an empty string (which is correct). But even in that case, we need to set the href (filename + anchor) as the node's URL. Change-Id: If17cb9a42663b7d6f8f1444094129d5052699fbd Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Fix includesJarek Kobus2018-01-102-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The missing headers were included indirectly through the QHeaderView, QButtonGroup or QAction inside the generated ui files. Now, the generated ui files won't include QHeaderView, QButtonGroup nor QAction, so we need to include the missing headers explicitly. Change-Id: Ie10d9fc23a6032be44fcb11a3c1d275f8437cb92 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Qt Designer: Fix deprecation warning about QTextEdit::setTabStopWidth()Friedemann Kleint2018-01-081-1/+1
| | | | | | | | | | | | | | Use setTabStopDistance() instead. Change-Id: I0164d63818473329eb88e1a0658de312de6d00ec Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | macdeployqt: Add missing QtLocation and QtPositioning plugins deploymentSamuel Gaist2017-12-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | When deploying a QtLocation or QtPositioning based application, only the frameworks were deployed. This patch fixes this by also deploying the corresponding plugins. [ChangeLog][macOS][deployment] QtLocation and Qt Positioning plugins are now deployed along the frameworks. Change-Id: Ib3ceabcd86d69039dcd8ab6ae361ed6e3a5821a6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | macdeployqt: refactor plugin handlingSamuel Gaist2017-12-301-14/+11
| | | | | | | | | | | | | | | | Rather than adding new cases per module, use a map that will make it cleaner to associate modules with their corresponding plugins. Change-Id: Ia745066ec394f72d64b4ffe74ece4bbbf48aa2ac Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-1/+2
|\ \ | | | | | | | | | Change-Id: Idebf1c3bace79b0d316a63e362af4586b2701a0e
| * | windeployqt: winrt: Do not list translation files that are not deployedv5.10.0-rc3v5.10.0-rc2v5.10.05.10.0Oliver Wolff2017-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio projects for winrt usage rely on a proper list of files that are deployed. We concat translation files into a single qt_<prefix>.qm file using lconvert, but also mention every "sub file" (qtbase_<prefix>.qm etc) in json. That breaks deployment on winrt and thus should not be done on that platform. Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a134cb1855622694355d8564b2f6aa0b7bf08b29) Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | qdoc: Allow defining titles for navigation.homepage and landingpageTopi Reinio2017-12-065-13/+94
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'navigation' sub-variables 'cppclassespage' and 'qmltypespage' already have associated variables that allow defining a user-visible title, shown in the navigation. This commit does the same for 'homepage' and 'landingpage'. This makes it possible to avoid situations where the homepage title clashes with another (e.g. section) title: navigation.homepage = index.html navigation.hometitle = "Qt $QT_VER" Add documentation for the navigation variables. Change-Id: Ie4ff5f906b2ee6be01db65562025df7da2a9dff8 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-1512-20/+41
|\ \ | |/ | | | | | | | | | | Conflicts: src/qtattributionsscanner/main.cpp Change-Id: Idb919f217f1dea42728fd9318fd9f48d9c3d3f29
| * Call removeDatabase() when there is no QSqlDatabase object in scopeAndy Shaw2017-11-102-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | If there is a QSqlDatabase or QSqlQuery object around still that is active then when removing the database it will output a warning. Since the database was not opened here we just need to ensure the object is deleted first before we remove it. Task-number: QTBUG-59664 Change-Id: I95d658e178e3e5b95231e4d9525bf5994f5969c5 Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * windeployqt: Do not set translations' file name as target directoryOliver Wolff2017-11-061-2/+2
| | | | | | | | | | | | | | | | The target part of a json entry has to be a directory and not the final file name. Change-Id: I61c5649c61a3f539f58af7b636fc0ca1acb94c77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * clazy: Fix clazy-detaching-temporaryFriedemann Kleint2017-11-048-8/+8
| | | | | | | | | | | | | | Fix in Qt Designer, pixeltool, qtattributionsscanner and qtpaths. Change-Id: Ideae055e8880552c1b8bf5a2a38326ac1356ffcb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * macdeployqt sort QML modules before deploying themAurélien Gâteau2017-11-031-5/+17
| | | | | | | | | | | | | | | | | | | | Sorting QML modules makes sure a module is deployed before its sub-modules, avoiding the problem where macdeployqt would consider a module as deployed because one of its sub-module has already been deployed. Task-number: QTBUG-47067 Change-Id: I0ab8dd827fcd6eea0f0573157101ceb8f1a045fc Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macdeployqt: Add missing Qt3D plugins deploymentSamuel Gaist2017-11-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | When deploying a Qt3D application, only the frameworks were deployed. This patch fixes this by also deploying the corresponding plugins. [ChangeLog][macOS][deployment] Qt3D plugins are now deployed along the frameworks. Change-Id: I53f2f94ced10629d80d6a3d9af38a3f9517ae6bc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Fix styles deployment in macdeployqtv5.10.0-beta4Eike Ziller2017-11-021-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-64078 Change-Id: I2c23e440d6355effa384a56a215e92115be75a35 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Reduce some code duplication in macdeployqtEike Ziller2017-11-021-45/+28
| | | | | | | | | | Change-Id: I52989b7b997999263df77361fdf75939c73f35f7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-306-21/+29
|\ \ | |/ | | | | Change-Id: I9069b01eb82dfcce33e2afae3be853f7a5bd1fa8
| * Qt Designer: Fix clazy-strict-iteratorsFriedemann Kleint2017-10-252-5/+6
| | | | | | | | | | Change-Id: I6a75c9e29e2c789ac12d9d7b065ec502a322683c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Qt Designer: Fix clazy-container-anti-patternFriedemann Kleint2017-10-252-6/+4
| | | | | | | | | | Change-Id: I72581f2788fe3e8d81e50248929127408f639c9c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-171-5/+5
| | | | | | | | | | Change-Id: Ia4a9d8cf397ed09f9558584d7d1403f92d81d5a4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * windeployqt: Print list of translationsFriedemann Kleint2017-10-161-5/+14
| | | | | | | | | | | | | | | | | | Pass the options struct to deployTranslations() and add the files to JsonOutput. Task-number: QTBUG-63744 Change-Id: Ie1d8587cbeb22acc2fdcfba6e666059e3936c708 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Qt Designer: Fix clazy-qenumsv5.10.0-beta3Friedemann Kleint2017-10-263-3/+2
| | | | | | | | | | Change-Id: Ia043a1ef5cb89f72a22121b22b3914e1d5220f84 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Revert "Fix use after free"Jesus Fernandez2017-10-251-1/+1
| | | | | | | | | | | | | | | | | | This reverts 112540645d78000ad8dfed1bca6662a10522aaf1. The deleted pointer is not dereferenced. The pointer value is used as the key in the map. QMap::remove uses the parameter as a number. Change-Id: I668d22a0ba21a2f6696b4dfefc617f363d7760d1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Qt Designer/Linguist/Assistant: Fix clazy-unused-non-trivial-variableFriedemann Kleint2017-10-2513-17/+0
| | | | | | | | | | | | Change-Id: I45b89b7b0d33eb1e64daae1275661a79e27370df Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Fix use after freeJesus Fernandez2017-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This could cause an immediate crash or incorrect values might be read subsequently resulting in incorrect computations. In QtVariantPropertyManagerPrivate::​removeSubProperty(QtVariantProperty *): A pointer to freed memory is dereferenced, used as a function argument, or otherwise used (CWE-416) Coverity-Id: 22144 Change-Id: I0cd9c37769470e9c6f3d50fb53666b7db3e03c62 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-158-515/+16
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf examples/examples.pro Change-Id: I1b10716619d6a07466db9d5407a958062e7cd38a
| * windeployqt: Do not use debug redistributable files from "onecore" on Windows 7Friedemann Kleint2017-10-111-3/+7
| | | | | | | | | | | | | | | | | | They require Windows 10. Amends 061e1a8bbe5fb05b8f85811d55e805f54327d1d6. Task-number: QTBUG-63676 Change-Id: I32d94bf3d52616fc0d5c861a6a7444d8b8e61cdf Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Increase kmap2qmap KEY_MAX to 0x2ffPekka Vuorela2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux KEY_MAX was increased this way already in 2008. https://kernel.opensuse.org/cgit/kernel/commit/?id=03bac96fae0efdb25e2059e5accbe4f3ee6328dd commit 03bac96fae0efdb25e2059e5accbe4f3ee6328dd Author: Dmitry Torokhov <dmitry.torokhov@gmail.com> Date: Mon Jun 23 10:47:34 2008 -0400 Input: expand keycode space Expand the number of potential key codes from 512 to 768 since people are coming up with more and more keys. Change-Id: If4f36f9b42d6e74f9fedb5a74cb09703967ac97d Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * Remove unused snippetsKai Koehne2017-10-043-506/+0
| | | | | | | | | | | | | | The files are older copies of the example code, but are not used anymore. Change-Id: Ia77a06ecd420c9c9b73b203bc6c56421c6f5b788 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix build with -no-feature-libraryJake Petroules2017-09-291-0/+2
| | | | | | | | | | | | Change-Id: I733ea7dbcb8850766079c014e0d74bee533b5f19 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Fix typo in qdoc manualKai Koehne2017-09-121-1/+1
| | | | | | | | | | Change-Id: I699a997237f90a2f9d202953692162481be8844a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * qdoc: Fix linking of types in QML blocksMartin Smith2017-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | This change fixes a regression bug from before 5.6. QML type names were not being converted to links in Document files. Task-number: QTBUG-62440 Change-Id: I76ba9a654645a63651c6b3e15431369ec52d90de Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Account for custom property sheet extensions when getting objectNameAndy Shaw2017-09-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | In order to account for custom property sheet extensions in a custom widget plugin, it needs to be possible to obtain the objectName value from a QVariant containing a QString. So to enable this, a check is done to see if the variant is storing a PropertySheetStringValue. If it is not then it is expected to be convertable to a string. Task-number: QTBUG-62936 Change-Id: I8ce2053256a5b18851254c3ed1d6037d12023bf5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix missing QRegExp includev5.10.0-beta2Samuel Gaist2017-10-051-0/+1
| | | | | | | | | | | | | | | | | | Complement to the cleanup already done as a new use of QRegExp has been added. Change-Id: Ia5d06387c26299afdf28c2bc54c35ebff9393b12 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Do not entirely skip designer if there is no process supportOliver Wolff2017-10-052-14/+17
| | | | | | | | | | | | | | | | | | | | As UiTools and UiPlugin can be built without any process support, these parts should be built on platforms that have support for them (winrt for example). Task-number: QTBUG-63597 Change-Id: I0928b4e229f44abfbb89692a82d1d7ad8e794227 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | qdoc/generator: demonstrate QOverload instead of complex syntax...v5.10.0-beta1Gatis Paeglis2017-09-251-10/+9
| | | | | | | | | | | | | | | | | | ...for connecting to overloaded signals. Change-Id: I30ad6c371f01212dba8a6f9a905c766a961b32a1 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
View Lorry Controller Status