summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-23/+48
|\ | | | | | | Change-Id: I590e937321b652bf15317b28a5601aa4e3926556
| * windeployqt: Deploy MSVC2017 redistributable filesv5.9.1Friedemann Kleint2017-06-231-23/+48
| | | | | | | | | | | | | | | | Factor out a function looking for the files. Task-number: QTBUG-61549 Change-Id: If6938d67d479e85655937465670bb72b50a44650 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | windeployqt: Print missing modules in warning about disabled pluginsFriedemann Kleint2017-06-281-3/+6
| | | | | | | | | | Change-Id: Ice8b793c25ee1b57256a175d19a4314530b1f136 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Qt Designer: Fix shrinking row span of QGridLayout itemsFriedemann Kleint2017-06-261-1/+1
| | | | | | | | | | | | | | | | | | Previously, shrinking a row span by moving the bottom widget handle up did not work due to the code checking the width of the item. Correct to check on the height when creating the command. Change-Id: Ieb1cf7eb0e78bb2edba7f2a7d7ff920f28ada509 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QDoc: End "This function is reentrant" with a dotKai Koehne2017-06-221-0/+1
| | | | | | | | | | | | | | Fix \reentrant, \threadsafe output for functions. Change-Id: I192ed48a292ccf7ffcc87b8422ba1f185d9d6629 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | TextFinder: Improve code and documentationKai Koehne2017-06-222-8/+2
| | | | | | | | | | | | | | Task-number: QTBUG-61419 Change-Id: Ib00152f0a04546d275a40a5d57fe046b82ebc421 GPush-Base: 8abb03b0d84a3a94f7db41e010f69955488ea893 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Fix qdoc documentation about \eKai Koehne2017-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | The \e command was actually applied, which showed "Used for italics". Anyhow, I find the sentence redundant ... Change-Id: I31e8e10d7ee2f00b77ca174b498d5dac029f71be Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Add Examples link to UiTools overviewKai Koehne2017-06-201-0/+5
|/ | | | | | Task-number: QTBUG-61419 Change-Id: I29796201eb5b77a0c49074d1173e6e30f816f2c3 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Set the default QPA platform to minimal for the qcollectiongeneratorAndy Shaw2017-06-131-0/+1
| | | | | | | | | | | Since the minimal platform is used for the qcollectiongenerator this should be set in the pro file to ensure it will still work when this is statically built. Task-number: QTBUG-60926 Change-Id: I75481fe2600aecd573a429b9b9d6ec6acb803e6c Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix unmarked case fallthrough detected by GCC 7Thiago Macieira2017-06-061-1/+2
| | | | | | | helpviewer_qwv.cpp:97:33: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c4871dfbf13a14 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix GCC 7 warnings about unmarked case statement fallthroughsThiago Macieira2017-06-042-2/+5
| | | | | | | doc.cpp:632:39: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c48709a6772552 Reviewed-by: Martin Smith <martin.smith@qt.io>
* qtdiag: Show more useful information about styles and platform themesThiago Macieira2017-06-032-5/+17
| | | | | | | | | Only listing the names that we're requesting is misleading. It does not show actual capability. Instead, show both what we're requesting and what is available. Change-Id: I0e1a09998253489388abfffd14b5f0eb4315ab77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* windeployqt: Determine name of ANGLE libraries by existenceFriedemann Kleint2017-06-021-8/+8
| | | | | | | | | | | Previously, the name was determined by checking the dependencies of QtGui, which are not present in the dynamic GL case. Replace by a check for the file name. Task-number: QTBUG-60962 Change-Id: I8778dc0d03808f88ed8f5dc6b3ca4acd22aae3ae Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix enablement of search result widget arrowsJarek Kobus2017-06-011-76/+25
| | | | | | | Enable also the search result label. Change-Id: Iea35c30eaef0af27302f036f987de757b98379b8 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into ↵Liang Qi2017-05-314-22/+38
|\ | | | | | | refs/staging/5.9
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-314-22/+38
| |\ | | | | | | | | | Change-Id: Idb412afb4f444ac57a5fadc907e12c58ab299d9a
| | * windeployqt: Unconditionally deploy all files of Quick Controls 1v5.9.0-rc2v5.9.0-rc1v5.9.0Friedemann Kleint2017-05-221-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files are added to resource files only in the case of static builds; so, for Windows UWP 64, for which QML caching is disabled, they were missing. Task-number: QTBUG-60536 Change-Id: Idb795f71441ab1bfbc1cdbc53a322ee9e86e54bc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Move the linksForKeyword from QHelpModelIndex to QHelpEngineCoreJarek Kobus2017-05-093-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Obsolete it inside QHelpModelIndex. Change-Id: I11f1e67c6eac6e6790a7c73d5850f5b415214db1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| | * Revert "windeployqt: Remove deployment of libglesv2 and libegl"v5.9.0-beta4Friedemann Kleint2017-05-051-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back the autodetection of ANGLE as the naming now depends on configure switches. This reverts commit fc8b7d36291611aebdc344f2e26a992da0003bbc. Task-number: QTBUG-60373 Change-Id: I14826cd1730fddb203e9a7c98b76d7def7388d9c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | windeployqt: Add Qt5GamePad with pluginsFriedemann Kleint2017-05-311-1/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-61127 Change-Id: I66681129b3bbdc1b37e3c17b4e70ac4ee17bb7f3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | windeployqt: Refactor the plugin - module lookup to use an arrayFriedemann Kleint2017-05-311-34/+40
|/ / | | | | | | | | | | Task-number: QTBUG-61127 Change-Id: I31cb3dad0a11add87d51943534ae572b4c50bfe3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Add missing break in switchThiago Macieira2017-05-301-0/+1
| | | | | | | | | | Change-Id: I9bf1e35bffb044dcbf62fffd14bfecea5bdaff2a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | remove bogus QTPLUGIN+=qsqlite magicOswald Buddenhagen2017-05-291-2/+0
| | | | | | | | | | | | | | | | | | | | the code was originally meant to link the plugin if it's not built into qtsql. this logic did not survive the various build system refactorings, but it's also entirely pointless, because available static plugins are now automatically linked. Change-Id: I5e45798a2e3cdddb8aa6fc7c283f023cf4d2c2c9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Qt Designer: Fix crash in "Go to slot" dialog when no signal is selectedFriedemann Kleint2017-05-291-7/+10
| | | | | | | | | | | | | | | | Add a check for the selection. Task-number: QTBUG-61009 Change-Id: Ic99d8ca2b9b838b2cb24f1cf4b259c38e2a6f1ca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Revert "androiddeployqt: don't include plugins that are not necessary"Shawn Rutledge2017-05-261-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4f6d0ee8743f57d29e6f1fd13440c7242bea6134. It prevented some files in QtQuick.Controls 1 and QtQuick.Dialogs from being deployed, and the result was that Dialogs could not be used at all. Task-number: QTBUG-60918 Change-Id: Id2bb8edba54b0dd1c29ab558690db3c342aa8ee7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oleg Yadrov <oleg.yadrov@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Deploy the iconengines with the applicationAndy Shaw2017-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The iconengines should be deployed automatically since they could be used by the application without needing to explicitly include their dependency in the application. This brings it in line with what windeployqt does too. [ChangeLog][Platform Specific Changes][macOS] iconengines are deployed with the application when using macdeployqt. Task-number: QTBUG-59609 Change-Id: I7fd3bf9d55d2979f30a2ad7959a6a31919d49c8c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Fix GCC 7 warnings about implicit fallthroughsThiago Macieira2017-05-193-5/+6
| | | | | | | | | | | | | | Make them explicit. Change-Id: I9bf1e35bffb044dcbf62fffd14bfecd847104fef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix build break when qreal is defined as floatTomasz Olszak2017-05-041-1/+2
| | | | | | | | | | Change-Id: I99725764995111a7eee9c70f5b10fabcb54b3c0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix the build with qtwebkitJarek Kobus2017-05-043-13/+13
|/ | | | | Change-Id: I26459d44fb7bd0dc6e98f073984ee0ff04b945d6 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* disarm webkit use in assistantOswald Buddenhagen2017-05-041-1/+2
| | | | | | | | that configuration is currently broken. Change-Id: Ia35ba4d0b90687db26a0bb6f664df01e1ed1490a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix licensingJani Heikkinen2017-05-0311-132/+165
| | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one - Switch old LGPL3 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: I36a5b5b823cede544f43ac8349b5db27f8df6abc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 15:01:22 +0000