summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* qdoc: Fix handling of '#if defined' preprocessor statementsTopi Reinio2017-09-021-1/+1
| | | | | | | | | | Fix the regular expression that incorrectly made parentheses mandatory for the #if condition; an optional specifier ('?') was missing for the closing parenthesis. Task-number: QTBUG-62931 Change-Id: Ia046d4217f64560dd49707ec2d01b73071ba2d03 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Add change file for Qt 5.6.3Antti Kokko2017-09-011-0/+27
| | | | | | | Task-number: QTBUG-62720 Change-Id: I1cfb0ef390f1e7d8f1cb289f898e7915201f7ea1 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Designer: Remove widget from Z-order list in ReparentWidgetCommand::undo()Friedemann Kleint2017-08-281-0/+1
| | | | | | | | The statement was apparently forgotten. Task-number: QTBUG-62049 Change-Id: I9ab30ff2a094901965a76e8236a833f96cd7ec23 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Android: copy the specified stdc++ libraryBogDan Vatra2017-08-231-9/+32
| | | | | | | It is needed to handle android-clang Qt builds Change-Id: Ie52e0faf6d971d4ada4d8fd9a3f1529f1145995c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Install missing qtwebengine_devtools_resources.pak file for WebEngineAlexandru Croitor2017-08-141-0/+1
| | | | | | | Task-number: QTBUG-59251 Change-Id: I1e1b3c3301755aaabcccb85af1ca1b2dee52a59b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix crash regression when using ANDROID_DEPLOYMENT_DEPENDENCIESEskil Abrahamsen Blomfeldt2017-08-021-1/+2
| | | | | | | | | | | | | | Change 919d07e6809a6705941a9819ba145062a947fa39 introduced a splitRef() on a temporary string, which will cause dangling pointers as documented. This caused crashes for everyone using ANDROID_DEPLOYMENT_DEPENDENCIES. [ChangeLog][androiddeployqt] Fixed a crash when using ANDROID_DEPLOYMENT_DEPENDENCIES to specify the files to deploy. Task-number: QTBUG-61636 Change-Id: I16dc84f76667e9b8af5edf79d7c6498657176247 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* windeployqt: Check folder "onecore" for MSVC debug redistributable filesFriedemann Kleint2017-07-271-1/+4
| | | | | | | | | It seems to be required depending on MSVC edition and installed toolchains. Task-number: QTBUG-61549 Change-Id: Iae800e9f37f1ca301731011e72f8d3223f3585c1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Deploy the geometryloaders plugins for Qt3DRenderAndy Shaw2017-07-241-1/+2
| | | | | Change-Id: Ibf296ae7ccb4373512298eef7cfd92b21891af76 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* winrtrunner: Give additional hint in case of missing prerequisiteOliver Wolff2017-07-201-4/+9
| | | | | | | | | | | | | | If the user has not added additional dependencies, winrt projects only depend on Windows.Universal and we have seen some cases, where its MinVersion was not met by the user's Windows version. We can give an additional hint if this error occurs and it might even push the user into the right direction if he has added his own dependencies. Task-number: QTBUG-61441 Change-Id: I54bbc424087dad2ffd626e58cc6f3a493b60f44e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* winrtrunner: print verbose error after failed deployment operationOliver Wolff2017-07-201-12/+0
| | | | | | | | | | Just remove an early return in the case that the deployment operation was not successful. Printing out the verbose error message was already implemented. Task-number: QTBUG-61441 Change-Id: I54f22879ec84f4a984af49c9e43e4f9e88732d6e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* windeployqt: Fall back comparing names of QML modules when their class name ↵Friedemann Kleint2017-07-172-10/+8
| | | | | | | | | | | is empty QtWebEngine and some other modules have empty class names, so they are dropped when concatenating QML imports. Task-number: QTBUG-61957 Change-Id: I06ccf8ab54b2d3ffba04f15746722f5b3596d5d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix remaining GPL-EXCEPT license header in Qt UI ToolsKai Koehne2017-07-141-5/+16
| | | | | | | Was forgotten in 30c10900ade. Change-Id: Ib85259a7dacfd255419da411e5a2db981fe4ffbf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Suppress QEvent::LayoutRequest when changing layout spanFriedemann Kleint2017-07-073-0/+32
| | | | | | | | | | | QTabWidget activates its parent layout when resizing, which prevents it from smoothly resizing when changing item spans. Suppress the QEvent::LayoutRequest when the widget handle is in a span-changing mode. Task-number: QTBUG-61439 Change-Id: I87b2c9d5e3e6796983b730907cf3bfe8c7ed2292 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* 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>
View Lorry Controller Status