summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc1Liang Qi2017-11-211-0/+24
|\ | | | | | | Change-Id: I7c5be528f6f3c80014a1f465f2a5c12eb14b90f0
| * 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>
* | Add changes file for Qt 5.10.0Antti Kokko2017-11-201-0/+27
| | | | | | | | | | Change-Id: I1236e10ae81e5cc3e0debb70e3e0c9570633b4a8 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-1522-591/+121
|\ \ | |/ | | | | | | | | | | | | 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>
| * 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>
* | 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>
* | Fix problems when building with -no-feature-processUlf Hermann2017-09-1211-38/+18
| | | | | | | | | | | | | | | | | | | | | | Guard the QProcess includes, modernize some ifdefs, exclude tests and examples that don't work without processes, and use QT_CONFIG(process) rather than QT_BOOTSTRAPPED as discriminator where we are actually checking for QProcess support. Also, don't try to build linguist and designer without QProcess. Change-Id: I4e1c7485a96ff02f2f6241113add35e44dc54b1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-alpha1Liang Qi2017-09-044-10/+61
|\ \ | |/ | | | | Change-Id: I82a3e068458fe176ec0e4c441e53a4fa97ae5d4b
| * 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>
* | Qt Designer: Add C++ guards to precompiled headerFriedemann Kleint2017-08-301-0/+2
| | | | | | | | | | | | Task-number: QTBUG-62872 Change-Id: I637ee1bf7c733c4ccaf45745837fda2966fe2482 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | qtattributionsscanner: Allow to use it for one single fileKai Koehne2017-08-286-25/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows a saner use with qbs, where we can and should actually handle the dependencies correctly. In addition, this patch adds an optional '--basedir' argument that is needed to correctly root relative paths that are printed in the documentation. Change-Id: I0abf769ad5c0a3ac15b6907f83b77d369eb78d1f GPush-Base: 5c8d5742dc7b5e00a6aed447e8f288680b58e225 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status