summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Allow functions of animations4.15Thomas Hartmann2022-09-191-0/+3
| | | | | | | | For some reason we get nullValue for the functions of animations like 'update', 'start', 'restart', 'stop', 'pause'. Change-Id: I2301083d6d61e2f8f59e5878023cac0fcf711e61 Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* qml2puppet: make it compatible with newer Qt versionsTim Jenssen2021-09-161-1/+1
| | | | | Change-Id: I2a6b074dbb238fc76e7f33a1da82211dc22d46a3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix build with MSVCv4.15.2Eike Ziller2021-07-091-0/+9
| | | | | | | Amends c3e413a8643857111ea80747605ba2cf5c2e328b Change-Id: Idb7e3c9d4cf53cf989d5aa4dd4353db798b92fb6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* proparser: Update ProItems to state in Qt 6.2Eike Ziller2021-07-092-27/+85
| | | | | | | | | | | | | | | | | Except for our Qt 5 workarounds with toStringView, qHash return value, and ProStringList which must be an explicit QVector for Qt 5. Most importantly that pulls in a change to ProString::toQString(QString &tmp) const from 76004502baa118016c8e0f32895af7a822f1ba37 in qtbase, which replaces a setRawData call which otherwise leads to severe issues when built with Qt 6. Fixes: QTCREATORBUG-25574 Change-Id: I488b4e0b63becc59a4ea34aace5c249921fa1a60 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add changes file for 4.15.2Eike Ziller2021-07-091-0/+55
| | | | | Change-Id: I691d64c4faac7158009d6f93a089cab184934893 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qmake: Fix issues with executing system callsEike Ziller2021-07-082-14/+22
| | | | | | | | | | | | | | | | | | | | Do not try to reuse the QFutureInterface that is used for the parsing process. Reusing the QFutureInterface can lead to issues. So far no problems were triggered, but a30aa4421a0257b048197b51330e6bf5c2732af5 introduced a watcher that tells the qmake parser to ignore all system calls after the future was canceled. This was somehow, sometimes triggered on the reused QFutureInterface even though the user didn't cancel anyhing, leading to all system calls to bail out in the subsequent run. Using a new QFutureInterface instance for each parsing run solves the issue. Amends a30aa4421a0257b048197b51330e6bf5c2732af5 Fixes: QTCREATORBUG-25970 Change-Id: I6836c97038c36968e93815c6121bc284edbe19bb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlPuppet: Fix build with Qt 6.2Alessandro Portale2021-07-081-1/+0
| | | | | | | | | | | Fixes: QTCREATORBUG-25763 Change-Id: I05f4b44a3793c41fd1c6812f40f6603892cdac50 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit dcbf26490d485c91c4475de8233b4ab1ffe705ea) Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Squish: Add parentheses around all print statementsRobert Löhning2021-07-052-3/+4
| | | | | | | Required by Python 3. Change-Id: Ia28491882a844d3642da38145b1ebfcfbd5883b3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Stabilize tst_HELP02Robert Löhning2021-07-051-6/+10
| | | | | | | | On Windows, the shortcut gets lost when clicking "Stop Recording" too quickly. Change-Id: Ieb89b7f59ded0792bf09fbad0b4b44a78d369c0f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update Qbs submodule to the top of 1.19 branchIvan Komissarov2021-07-011-0/+0
| | | | | Change-Id: If47a7abf972258a389b2af36eb73fd0ce2852b8a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix build with Qt 6.2 after components were renamedTim Jenssen2021-07-011-0/+11
| | | | | | | | | | | Some have a "Private" suffix now. cherry picked from commit 77fd87a545e2c3374b252603ad9da6e029f42f99 cherry picked from commit c29d4e09a2ddd8a9c0fac9402fb3b7875af83ad9 cherry picked from commit a803d04c171b31ec90c1ea2bb82930a967027ec8 Change-Id: Ie53d253b4fc9364b452e3eb1fe01345b6d8073d3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* WebAssembly: (Win) Use python.exe from EMSDK_PYTHON instead from PathAlessandro Portale2021-07-011-2/+3
| | | | | | | | | | | | | | | | This affects Windows only. Instead of searching python.exe in the Path, use the executable name which is stored in the "EMSDK_PYTHON" environment variable (which is set by emsdk_env). emsdk_env also prepends entries to Path, but not the one pointing to the emsdk-shipped python interpreter. I believe that earlier versions of emsdk_env used to add the python location to Path, else this is an old bug. Fixes: QTCREATORBUG-25897 Change-Id: I9b5bc43f865d19a862f8c6cd45105be54286a549 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update Qbs submodule to the top of 1.19 branchIvan Komissarov2021-06-231-0/+0
| | | | | Change-Id: I79385eb5d49c46a4e856682f3be43c954ca26717 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix that disabled QRC files were enabled by QRC expansionEike Ziller2021-06-231-0/+1
| | | | | | | | | | | | The automatic expansion of QRC files to the tree of their contents didn't preserve the "enabled" property of the original QRC node. For CMake projects that resulted in the file system tree still being shown, with only the QRC nodes, when "Hide Disabled Files" was on, instead of hiding the file system tree completely. Change-Id: If1eb88478955dc8635def844cfc501befcbfc329 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMakePM: Do not expand qrc files for <File System>Cristian Adam2021-06-231-1/+10
| | | | | | | | | | | | | The qrc file expansion could take time and it's not a great idea to do it for all files in the filesystem. Amends 53115259baa522d0d2d8f05aaa058693b1de62a8 Task-number: QTCREATORBUG-25783 Change-Id: I10b1f6c224e78b0efe4654bcf36d7cb9ba0e7e5f Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Replace Freenode with Libera.ChatKai Köhne2021-06-232-4/+4
| | | | | | | | Change-Id: Ia4a54b72f522a02c734273630c8217af75e4ea92 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Robert Löhning <robert.loehning@qt.io>
* CMake build: Force optimization of CPlusPlus libEike Ziller2021-06-224-8/+46
| | | | | | | | | | | Even in the debug build, as done for the qmake build system. This is for performance optimization of this critical part for C++ parsing even in debug / developer builds. Change-Id: I9552ba9fc44e213f2df1d2d2a64a126af3603fd1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Qmldesigner : Fix crash when component is added while editing inline delegateTuomo Pelkonen2021-06-221-2/+3
| | | | | | | | This is only fixing the crash but does not adding the import Task-number: QDS-4602 Change-Id: Iacb449d5342fcfdd5daf21abcec668569380ddba Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* AnnotationEditor: Merge dialogsMichael Winkelmann2021-06-2112-537/+283
| | | | | Change-Id: Ibabd7d0d328af8cae8a4ced6747db52b33274bf0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Squish: Fix expectationsChristian Stenger2021-06-211-2/+7
| | | | | | | The output on finishing debugging had changed. Change-Id: I8193718594c0aceef13867d6acd1c8c0aaba6353 Reviewed-by: Robert Löhning <robert.loehning@qt.io>
* cmake: fix `Qt6Core5Compat` detectionTim Blechmann2021-06-161-1/+1
| | | | | Change-Id: I6de4de1f20b4e611f632ee515cfdf5243f2d16ba Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Avoid iterating project tree for each build targetEike Ziller2021-06-151-9/+13
| | | | | | | | Reduces lock-up in main thread after loading projects Task-number: QTCREATORBUG-25783 Change-Id: Ie769074f1689698379bd6fd60f74957086cfce37 Reviewed-by: hjk <hjk@qt.io>
* COIN: Add deployment target for macOSEike Ziller2021-06-151-0/+3
| | | | | | | Minimum deployment target for Qt 6 is 10.14 Change-Id: If85f34d89a39b92eedc42b0ff9a581264917a589 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* COIN: Remove unused LLVM environment variableEike Ziller2021-06-151-17/+0
| | | | | | | | We are passing it explicitly to the build script and don't use the provisioned version anyhow. Change-Id: Id136e06023621389763eeeda021fa64551a148a3 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Fix Q_PROPERTY warningMitch Curtis2021-06-141-1/+1
| | | | | | | | Explicitly cast to bool since that seems to be the intention. Fixes: QTBUG-90607 Change-Id: Ic7debcc6af4415af6288aa1739bd602dbca0e251 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ManhattanStyle: ensure text isn't cut-off in some UI elementsAhmad Samir2021-06-141-4/+6
| | | | | | | | | | | | | | navigationWidgetHeight() is used in various places to calculate the height of UI widgets that display text, e.g. the line-edits in the search bar, hardconding a value results in the text being cut-off if bigger fonts are used; fix the issue by using the higher value of navigationWidgetHeight() and fontMetrics().height(), this ensures widgets will accommodate the text. Fixes: QTCREATORBUG-24535 Change-Id: I83ca7885840a75e05e913f7ecc77a60e61f8ef9b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Update default image for ImageThomas Hartmann2021-06-111-0/+0
| | | | | Change-Id: I83f795ee5cb6c9ecfbf06c50d5d2ab5ade4fbabc Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMakePM: Raise timeout for ctest runChristian Stenger2021-06-111-1/+1
| | | | | | | | | | Depending on the size of projects and the underlying toolchain we may end up with no tests as the timeout for the ctest run was just too small. Fixes: QTCREATORBUG-25851 Change-Id: I5617987a9e43b16c02a2c0b4afd598a3ff909299 Reviewed-by: David Schulz <david.schulz@qt.io>
* CMakePM: Do not emit error signal in destructor while project is parsedCristian Adam2021-06-101-2/+0
| | | | | | | | | | | | Do not emit error occurred in the fileapireader destructor if it's parsing. This will cause the fallback file system view tree to be generated just before the parsing will be stopped. This can lead to crashes. Task-number: QTCREATORBUG-25837 Change-Id: Ic7a2dfc394ed8e259da3366727a3c5fa65d98776 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Bump version to 4.15.2Eike Ziller2021-06-103-6/+6
| | | | | Change-Id: Ida5406673616350ad6656533de179342ab320171 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix a crash-on-close in the dockmanagerKnud Dollereder2021-06-091-4/+11
| | | | | | | | | | | The destructor of DockManager deletes floatingwidgets in a for loop. The destructor of these floatingWidgets calls back to the DockManager and alters the list it is currently iterating over. This is now quick-fixed by deferring the deletion by using a temporal vector. Change-Id: I40b77ea505a5fc7506117dc16476e2e498ce4aef Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMakePM: Enable extra compilers only for files in the projectCristian Adam2021-06-091-1/+1
| | | | | | | | | | | | Qt Creator 4.15 added the "<File System>" project node containing all the files in the source directory. Qt Creator for its "find extra compilers" step needs only the files from the project and not all the files in the system. Task-number: QTCREATORBUG-25783 Change-Id: I5d33d5296f67ab3f321c232e5071f32e56d29101 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Do backup/restore configuration for all casesv4.15.1Cristian Adam2021-06-081-4/+4
| | | | | | | | When "Auto create build directories" is not checked, then the first configuration is done in /tmp, which is covered by workDirectory. Change-Id: Iad65b4776433ce296bd2561195fcf1bb6f8ace1d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Clear and setup file watcher before and after backup configurationCristian Adam2021-06-081-0/+6
| | | | | | | | | | | Qt Creator 4.15 will do a backup of the CMake file-api, but the file watcher that triggers a reparsing was not cleared up before the backup. This could lead to unnecesary file-api rescans. Task-number: QTCREATORBUG-25783 Change-Id: Id91379ea85c8a91e03d952c5c66b0371ebff943f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AssetExport: Enable setting custom metadata file name for exported componentsTapani Mattila2021-06-083-6/+23
| | | | | | Task-number: QDS-4384 Change-Id: I5d41ab00f7f90137355289f341defcb87ddf3b44 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Add changes file for 4.15.1Eike Ziller2021-06-081-0/+121
| | | | | Change-Id: I032ed9a2113e0e2a13988b58d2acf90c0fab7aa3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* FlowEditor: set TopRightCorner as the default text position for FlowDecisionTuomo Pelkonen2021-06-081-2/+2
| | | | | | Task-number: QDS-2508 Change-Id: I1bb62443b8361fc166a7e92644d2641194c105ef Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMake build: Add files from qtc_copy_to_builddir to treeEike Ziller2021-06-071-1/+4
| | | | | | | | | Make the files from qtc_copy_to_builddir part of the project tree, so they get included in searches etc. Change-Id: I191f88c8520b9e4a16fd6a5acfeda9cf880cea89 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* iOS: Don't run event loop while executing xcode-selectEike Ziller2021-06-041-1/+1
| | | | | | | | | | | | This fixes debugging Qt Creator with the iOS plugin enabled. For unclear reasons running the event loop while executing the process locks Qt Creator up when debugging. Since running the event loop is a dangerous hack anyhow and in this case we don't have much benefit from it, just don't do it. Change-Id: Ie147d3461823587a987d0920efdfae0839fb5b67 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Fix QKeySequence construction on macOSKnud Dollereder2021-06-041-1/+1
| | | | | | | | | | Constructing a QKeySequence with the string "Cmd+Opt+Shift+V" leads to an invalid, non-empty QKeySequence when compiling Design Studio on macOS. This triggers an assertion later in the code path. Using “Ctrl+Alt+Shift+V” instead works as expected. Change-Id: I7cb185d18f9ffbb7454c61f28a93cdd307121882 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Mode bar: Fix splitting configuration name into two linesEike Ziller2021-06-041-15/+37
| | | | | | | | | | | | | | | | Amends 0795d5f42d6ead3ce2bce1203bb527413c6373f4 - QRegularExpression::match does not support negative offsets, so that part was wrong when porting to QRegularExpression - QString::lastIndexOf with QRegularExpression and negative index is broken in Qt > 5.15.2, which leads to endless recursion Use good ol' loops instead, which also saves the overhead of throwing a regular expression on this. Task-number: QTBUG-94215 Change-Id: Ia9747c32fc775f2a735af97a6b73f9a5021882ab Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix missing checks for GHS-ArmErik Verbruggen2021-06-041-2/+5
| | | | | | | | | | Some places where ghs-specific checks were done, were not modified to do the same for ghs-arm. Change-Id: I484f98209188e4c160a13248ca3c3f046b342b22 Reviewed-by: <christiaan.janssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 943c31a5b4d5229a6727089f38497ad43cbfffbf)
* Change the generator for the GHS and GHS-Arm compiler to JomErik Verbruggen2021-06-041-0/+9
| | | | | | | | | | | Using Ninja not all modified files will be compiled in an incremental build. Fixes: UL-4247 Change-Id: I0bdb1e611e54ea6674ccae4d23391ac86f0960b8 Reviewed-by: <christiaan.janssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 3ed6f5805688a3e39a898d6aad6f9cd2159a2f42)
* Add support for the Cypress traveo II kitErik Verbruggen2021-06-043-5/+62
| | | | | | | | Fixes: UL-4242 Change-Id: I0b492a3edd6a1dce9d214e6490e174050c3fdb30 Reviewed-by: <christiaan.janssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit d98feae8f6fb2f019571f678e8cd55d8a7b5af6d)
* StudioWelcome: Pseudo destaturationThomas Hartmann2021-06-041-4/+8
| | | | | | | | Qt 6 does not have the QtGraphicalEffects module anymore. Change-Id: Idb4e9d141a65b31ad68058d95ffa519bd65f5c4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Update Qbs submodule to the top of 1.19 branchIvan Komissarov2021-06-031-0/+0
| | | | | Change-Id: I8d404b0c45822afe8a95bdc777af0685906bbf6d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* CMakePM: Cancel active C/C++ parsing before starting CMakeCristian Adam2021-06-031-0/+4
| | | | | | | | | | | | | If CMake is being triggered when C/C++ parsing is running, make sure to cancel() the C/C++ parsing before running CMake. The C/C++ parsing is issued after the CMake project is loaded, so for a subsequent CMake run there is no need to have the system busy with C/C++ parsing and at the same time run CMake. Change-Id: Ib9a2e057a90d9572e904ff449666bb9b12d1accc Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CppTools: Add missing null pointer checkChristian Kandeler2021-06-031-0/+3
| | | | | | | | | Prevents a crash trying to look for decl/def matches in non-applicable locations. Fixes: QTCREATORBUG-25806 Change-Id: I70961109267a2955bef0434a92f1d913b8c0c9c1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake: cancel file api parsingEike Ziller2021-06-013-8/+34
| | | | | | Change-Id: Ie59370fa4329f92dd28bf3e147b2828cbd75330b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Save cmake parameters in qtcsettings.cmake also for initial runCristian Adam2021-06-015-26/+26
| | | | | | | | | | | This way projects can have access to all CMake parameters that were issued from Qt Creator. Previously the initial run was skipped, only the subsequent changes were picked up. Change-Id: I7a2262cdb9754ff666f78fd2e39663466f494f5f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
View Lorry Controller Status