aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
Commit message (Collapse)AuthorAgeFilesLines
* qmake: Prevent injection of empty values via environment variablesChristian Kandeler2020-08-281-2/+5
| | | | | | | | | | | | | | | | | | | | | The qmake $() operator retrieves environment values at make time. In Qt Creator, we still use these values for feeding the code model, presumably because the qmake and make step share a common environment. However, we must take care that unset environment values do not lead to empty strings in qmake lists, as that can have unwanted side effects, especially when these lists get turned into command line arguments that are passed to build tools. A concrete example: A project file contained the following assignment: QMAKE_CXXFLAGS += $(SOME_VAR) SOME_VAR was not set in the environment, so an additional empty argument appeared on the command line when the code model called the MSVC compiler to retrieve some information required for parsing the code. The call failed, the code model had to fall back to default values, and the user got parsing errors. Fixes: QTCREATORBUG-21729 Change-Id: I224369a2fb9c0dd78406253edba03bd44556be44 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update qbs submoduleIvan Komissarov2020-08-241-0/+0
| | | | | | | To the head of 1.17 branch Change-Id: I4254418c746303c8a340a93f42128f34d4fa69b9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update Qbs submoduleIvan Komissarov2020-08-201-0/+0
| | | | | Change-Id: I6f6de1f368cfc6cb94d9503ab9554efc19ae0c97 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update Qbs submodule to head of 1.17 branchIvan Komissarov2020-08-141-0/+0
| | | | | | Change-Id: I92f5f8af60487c9aa71022dad26d348ceef1b181 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update qbs submoduleRichard Weickelt2020-08-061-0/+0
| | | | | | | To HEAD of 1.17 branch. Change-Id: If128125a5e6a24efe7cdd523e133634e2bfe72d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update qbs submoduleRichard Weickelt2020-07-241-0/+0
| | | | | | | To HEAD of 1.17 branch. Change-Id: Ic9015ebc7bb77b2ae6d9a10fd93d1e4a5279ff1d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update qbs submoduleRichard Weickelt2020-07-101-0/+0
| | | | | | | To HEAD of 1.17 branch. Change-Id: I9cb01480d72d3d6132c80449ac2da5e18dc6c7f4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Clang: Fix handling of paths inside common pri fileChristian Stenger2020-07-091-2/+4
| | | | | | | | | | contains() expects a regular expression as value, so using a bare windows path may be a bad idea. Beside this fix the LLVM_INCLUDEPATH which is reported wrong already by llvm-config. Change-Id: I95aa3e461541099aac6607c4a8db8a38f9b2b0f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Help: Fix clang warning about unneeded copyChristian Kandeler2020-06-261-1/+1
| | | | | Change-Id: I0526245773be1dcc71f7ed28e9c5113f20b66df6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* ProParser: Adapt to QRegExp removalhjk2020-06-243-30/+57
| | | | | | | | | That's part of a1947aeffe1 in qtbase, with manual adaptation. It looks like we've been out-of-sync with upstream already before. Change-Id: Ie6ef9e4fce44e01944194dc27bd3f54274ad7c6f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* ProParser: Fix build with MSVCChristian Kandeler2020-06-231-0/+9
| | | | | | | Strangely, MSVC requires operator< for values of std::list. Change-Id: I5f62348a69d9b25585798b7824c6538d4cb5df7c Reviewed-by: hjk <hjk@qt.io>
* ProParser: Drop use of QLinkedListhjk2020-06-233-26/+29
| | | | | | | | Effectively 7cba2acd2cc and 0d88721d772 from qtbase. Task-number: QTCREATORBUG-24098 Change-Id: I88902b358d88e34032f588b9eb0af13c5b9d8675 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove uses QOverload<const QString &>::of(&QComboBox::currentIndexChanged)hjk2020-06-192-7/+4
| | | | | | | | Gone in Qt 6. Task-number: QTCREATORBUG-24098 Change-Id: I7ab2dcb9b7c71a3b0d07f05162ef2752e02dc881 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update qbs submoduleChristian Kandeler2020-06-171-0/+0
| | | | | | | | To HEAD of master branch. This fixes a number of Qt 5.15 warnings. Change-Id: I1e10134268ea3687d6ad979ae263fc91dc804d50 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Disable ClangRefactoring by defaultEike Ziller2020-06-021-2/+2
| | | | | | | | | | It is too unstable even for experimental status. Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProWriter: Do not insert a backslash when adding new filesChristian Kandeler2020-06-021-1/+2
| | | | | | | | ... if the previous line already has a trailing backslash. Fixes: QTCREATORBUG-24083 Change-Id: Ieabce541da2ef55bcbf3bd14d139b14f3a7575c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake build: Avoid using extend_qtc_target directlyEike Ziller2020-05-181-1/+1
| | | | | | | Also add a extend_qtc_test which checks if the test is known. Change-Id: Idd3b3a02ac61fce2622cb8681233cfbd96a77bc4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* qbs: update to the master branch and fix .pro files accordinglyIvan Komissarov2020-05-112-1/+4
| | | | | | Change-Id: I22a28c9d359340ba1fada04ec4eee525df8ecfca Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qmake: Run the test version of system()Christian Kandeler2020-04-301-4/+0
| | | | | | | | | | | ... also when PROEVALUATOR_FULL is not defined. For more correct parsing. We do not believe that this introduces additional risk, because the replace version of system() has always been enabled, and appears to be used more often. Fixes: QTCREATORBUG-23940 Change-Id: I036a20fdab3f6c51c612912b60686a123440f397 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-282-4/+7
|\ | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
| * CMake build: export less generic public includesEike Ziller2020-04-242-4/+7
| | | | | | | | | | | | | | | | | | Do not put every plugin's and lib's source folder into public includes. We require includes of the style <somelib/foo.h> and <someplugin/bar.h> if someone depends on somelib or someplugin. Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-171-0/+0
|\| | | | | | | Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
| * Update qbs submodule to HEAD of the 1.16 branchRichard Weickelt2020-04-161-0/+0
| | | | | | | | | | Change-Id: I8891681d62c107ec7e8dcf44c50f8d4e2dc4a87f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-141-0/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
| * Update qbs submodule to HEAD of the 1.16 branchRichard Weickelt2020-04-071-0/+0
| | | | | | | | | | Change-Id: I6a616a9f2e28deab53911c0f68baf062a94e0467 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix deprecation warning when using linksForKeyword()Jarek Kobus2020-04-031-2/+15
| | | | | | | | | | Change-Id: I6c8beeabb82f0a50def944ee893753a229c41908 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-031-2/+7
|\| | | | | | | Change-Id: I79083060dfc3bc4408123acd3b7305b9701650fd
| * ProWriter: Fix removeVarValues() functionChristian Kandeler2020-04-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | This function wrongly assumed that there is always an empty line between variable assignments. For instance, When renaming a header file in a project file where HEADERS follows right after SOURCES, the function would erroneously claim that it removed the header file from the SOURCES segment, so follow-up code added the name name there instead of to HEADERS. Fixes: QTCREATORBUG-23720 Change-Id: I55288b22fe16fa0593b277d8808ab5d64ba90549 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Integrate new filter engineJarek Kobus2020-04-024-5/+5
| | | | | | | | | | | | | | | | Adapt the code to deprecated usage of map as a multi map, hence all cases replaced by QMultiMap. Change-Id: I2d480467cd6e91d3e880555e6a21058dec056b3f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Port QtCreator over to use filterRegularExpressionLars Knoll2020-04-012-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QSortFilterProxyModel::filterRegExp is going to go away in Qt6, so port over to use QRegularExpression instead. This required some changes where setFilterWildcard/FixedString() was being used, as those would instantiate QRegExp based filters in Qt 5, and will use QRegularExpression in Qt 6. Use the generic setFilterRegularExpression here, to keep things portable between 5 and 6. Change-Id: I6379be781aa3821b10ba783c088f82c1a0970911 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-301-0/+0
|\| | | | | | | | | | | | | Conflicts: src/tools/qml2puppet/CMakeLists.txt Change-Id: Id6243b0f725a68075d789bf35e771113b742645b
| * Update qbs submodule to HEAD of the 1.16 branchRichard Weickelt2020-03-301-0/+0
| | | | | | | | | | Change-Id: I3a4fd475623790a1a34a15d530c5f4ea53603792 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-192-0/+13
|\| | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
| * Update qbs submodule to HEAD of the 1.16 branchRichard Weickelt2020-03-171-0/+0
| | | | | | | | | | Change-Id: I4a8621d466893715a3117f02bcf0368d6c5bc6de Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Qmake: Add some debug output for file add/remove operationsChristian Kandeler2020-03-161-0/+13
| | | | | | | | | | | | | | | | This will help collecting feedback from users affected by bugs. Task-number: QTCREATORBUG-22508 Change-Id: Idfc22245587dd2d71b229b4ab6c7562fb7a5ecfc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add some additional shortcuts for actionsEike Ziller2020-03-171-1/+2
|/ | | | | | | | | | | | | | | | | Add Cmd+Shift+- for decreasing font size on macOS. Do not add Cmd+= for increasing size, because it conflicts with the existing shortcut for "Replace and Find Next". Sprinkle some Backspace shortcuts in addition to Delete for removing items. There are (laptop) keyboards that either do not have a designated Delete key (requiring Fn+Backspace) or where the Delete key is not conveniently located/sized, and there is no benefit in making the distinction in that case anyhow. Fixes: QTCREATORBUG-706 Fixes: QTCREATORBUG-13733 Change-Id: I06274a9810b82800ec6158a883c95d2a7ae2465e Reviewed-by: David Schulz <david.schulz@qt.io>
* ProParser: Fix freeze with include loopsChristian Kandeler2020-02-101-1/+1
| | | | | | | | Make sure we exit also in inexact mode. Fixes: QTCREATORBUG-23567 Change-Id: I5e933b9acba344fda7b7cc0ed21696b710860622 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.11'Orgad Shaneh2020-02-061-0/+0
|\ | | | | | | Change-Id: I65ce6aa917219a8f8b91b48c7077f8097248375c
| * Update qbs submodule to HEAD of 1.15 branchRichard Weickelt2020-02-051-0/+0
| | | | | | | | | | Change-Id: I13514ad02848db6fa5a453230eb7c938134ce3ae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | BareMetal: Long live support for KEIL uVision v5.x debuggerDenis Shienkov2020-02-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds debugger integration from the KEIL uVision IDE: * http://www2.keil.com/mdk5/uvision/ This IDE has the uVision Socket Interface (UVSC) that allows to the applications configuration, building and debugging: * http://www.keil.com/appnotes/docs/apnt_198.asp Besides, it provides a binary client libraries for Windows, which are implements some API which we are use in this patch. Currently implemented the following features: * Enumeration of a stack frames. * Enumeration of a threads (tasks). * Registers view (read/write). * Local variables view (read/write). * Watchers view (read/write). * Disassembler view. * Current location marker. * Break-points. * Step-in. * Step-over. * Step-out. * Step-by-instruction. * Start/stop/pause/continue debugger. * Auto-detection for the installed uVision instances (as debuggers). * Wizard for choosing and configuring of the UVSC debug providers. At this moment added support only for the 32-bit ARM devices, provided by the STMicroelectronics: https://www.st.com/en/microcontrollers-microprocessors/stm32-32-bit-arm-cortex-mcus.html For this are implemented two debugger providers: * Simulator - allow to simulate the target device. * ST-Link v2 - it is a HW debugger. This implementation tested only with the QBS using the following target boards: * NUCLEO-F767ZI (based on STM32F767ZIT6 MCU). * STM32F4DISCOVERY (based on STM32F407VG MCU). * STM32F103x (based on STM32F103C8T6 MCU). A more detailed information about this patch can be found in a bug-tracker. Fixes: QTCREATORBUG-23426 Change-Id: Ie36a1f7430b56c33d6665cc35e43fe9bd95d28f1 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Don't initialize QFlags unnecessarilyAlessandro Portale2020-01-211-1/+1
| | | | | | | | | | | | | | And if needed, do it with {} instead of with nullptr or 0. Change-Id: Iae80253cd334494cfe1d69ec1552d710f2a31ad2 Reviewed-by: hjk <hjk@qt.io>
* | Use isEmpty() instead of count() or size()Alessandro Portale2020-01-203-4/+4
| | | | | | | | | | Change-Id: I0a89d2808c6d041da0dc41ea5aea58e6e8759bb4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Use even less nullptr for default flagshjk2020-01-201-1/+1
| | | | | | | | | | Change-Id: I5ec30de3e41dfc1c7bf6d5f5e36991eadcbbfb72 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Orgad Shaneh2019-12-071-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/mcusupport/mcusupportrunconfiguration.cpp src/plugins/python/pythonproject.cpp src/plugins/qmakeprojectmanager/qmakestep.cpp src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
| * Update Qbs submoduleRichard Weickelt2019-12-051-0/+0
| | | | | | | | | | Change-Id: I80c6d4a725b49c525680f903a15a6ca749e6c81a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-285-11/+8
|\| | | | | | | | | | | | | Conflicts: src/plugins/designer/codemodelhelpers.cpp Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
| * Update Qbs submoduleRichard Weickelt2019-11-261-0/+0
| | | | | | | | | | Change-Id: Ia0e9effcb6332db340c724a2f849156a4d6d6118 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Qt Designer: Fix some clang warningsFriedemann Kleint2019-11-254-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use using instead of typedef - User member initialization - Use nullptr - Do not use else after return - Delete pointers unconditionally - Fix some integer conversion warnings - Use auto for new/casts to avoid type name repetition - Use = default for trivial destructors Task-number: QTCREATORBUG-23248 Change-Id: I0a7465d3aa200b5c862bec82636d2d22ddf8297b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-211-0/+0
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/autotest/testresultspane.cpp src/plugins/cmakeprojectmanager/cmaketool.cpp Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
| * Update Qbs submoduleRichard Weickelt2019-11-201-0/+0
| | | | | | | | | | Change-Id: I4a3fa1924b61fac55026cf0004c6e6468de57471 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 22:01:13 +0000