summaryrefslogtreecommitdiff
path: root/src
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' 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>
* | Fix problems when building with -no-feature-processUlf Hermann2017-09-127-13/+15
| | | | | | | | | | | | | | | | | | | | | | 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-043-10/+34
|\ \ | |/ | | | | 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>
| * 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-283-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Don't create unused IndexItemTableJarek Kobus2017-08-281-3/+0
| | | | | | | | | | Change-Id: I0fa1ea9a1b6b6d1b1da481880f7a620284456487 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-179-34/+74
|\ \ | |/ | | | | Change-Id: I05937dcc25c64b90c16818eda31b888bd6611e51
| * 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>
* | 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>
View Lorry Controller Status