summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.9.6v5.9.65.9.6Antti Kokko2018-05-281-0/+24
| | | | | Change-Id: Ic531808fd1d9443ea3ed878fae7449f593c58418 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.9.5' into 5.9Qt Forward Merge Bot2018-04-112-1/+35
|\ | | | | | | Change-Id: Icc83b97dc7ff6bce1a0d80fdbd0318c5b0ab6146
| * Bump copyright yearv5.9.55.9.5Jani Heikkinen2018-03-221-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-67185 Change-Id: I4b857e2acbf10666446379390ee55a288a2d8cd2 Reviewed-by: Robert Loehning <robert.loehning@qt.io> (cherry picked from commit c6deb049d58e24fae9322d40ae79bc3f90c533af)
| * Add changes file for Qt 5.9.5Antti Kokko2018-03-211-0/+34
| | | | | | | | | | | | Change-Id: I3309b44d998fac9f61f0f09d061262bf6053209d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Bump versionOswald Buddenhagen2018-03-191-1/+1
|/ | | | Change-Id: Ic14062e48ed345f0ee44a969f6cd911d027dde05
* Bump copyright yearJani Heikkinen2018-02-065-5/+5
| | | | | | Task-number: QTBUG-65810 Change-Id: I3d9befbc56e1c7a63c383e872977e10d1eaa3734 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | Change-Id: I31c31abedd3de4399b739dd69ec4032c50bcc039
* 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.4' into 5.9Liang Qi2018-01-181-0/+28
|\ | | | | | | Change-Id: I3032d151c1bbf11b61be2ffbeed7db4588159db2
| * update changelogv5.9.45.9.4Oswald Buddenhagen2018-01-111-1/+5
| | | | | | | | | | Change-Id: I3e95fd8746c22bcde69605b15ee845f977679d24 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Add changes file for Qt 5.9.4Antti Kokko2018-01-091-0/+24
| | | | | | | | | | Change-Id: Idaaeec1e0f84573fe87c32b9714a3c9f490dd7dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | 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>
* | SimpleTextViewer example: Remove QObject::tr antipatternKai Koehne2018-01-042-2/+6
|/ | | | | Change-Id: I8e7d1dcf9cd2a5a1ccc563032324528fe3262611 Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>
* Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | Change-Id: I9786562c1fab729ae11ce71cda26c2f571a80fac
* 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>
* Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
|\ | | | | | | Change-Id: Ic2251f8c075b304ca0f48f10476d970cb21918bc
| * Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+24
| | | | | | | | | | | | Change-Id: Ie3ca0743147049bca5cfb5963197bf4c0ab4a7ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | 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>
* | 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>
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+28
|\ | | | | | | Change-Id: Ic71711dedb53b5a650f3a5eb52a12da7898ad1a7
| * Add changes file for Qt 5.9.2v5.9.25.9.2Antti Kokko2017-09-281-0/+28
| | | | | | | | | | Change-Id: I53b80881048cdeb9ad901bd2b998c891b0129d13 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I137d9ab9896a40b175937b4387dda3b4829271b1
* | RemoteControl example: Remove Q_INIT_RESOURCEKai Koehne2017-10-041-2/+0
| | | | | | | | | | | | | | For exectuables, resources are initialized by default. Change-Id: I3d1aea0afd9cc01996d4b0a496ac9a01787fce4a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | RemoteControl example: Remove superfluous connectKai Koehne2017-10-041-1/+0
| | | | | | | | | | | | | | quitOnLastWindowClosed is the default. Change-Id: Ic2afbef731895f2fce17050655d11facd51736ab Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Assistant Examples: Use nullptrKai Koehne2017-10-044-4/+4
| | | | | | | | | | Change-Id: Icfede0f02c6651aa39e2a0a9d5b586a5bb7037e9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Assistant Examples: Remove stray ;Kai Koehne2017-10-041-1/+1
| | | | | | | | | | Change-Id: I4374610fa78d2c42fc8ca88d80cd1f50a431d046 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Assistant Examples: Unify #include styleKai Koehne2017-10-0412-59/+64
| | | | | | | | | | Change-Id: I72c419123e27e06ae30fa2042fb8bb6ddbab9da4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>
* Improve SimpleTextViewer example documentationKai Koehne2017-09-181-9/+8
| | | | | Change-Id: I6da730993b6e9a0fd3b75705547260aef638048d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix exclusion condition for assistant examplesJake Petroules2017-09-151-1/+2
| | | | | | | | | | The actual reason why they were disabled for WinRT is because that platform lacks process support (see 40e060d). Therefore, this fixes the build for VxWorks as well. Change-Id: Id411c467f4c3bbed45f7bd3bd8d4881c72f3b466 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@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>
View Lorry Controller Status