aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation of sdktool against old Qt versionsEike Ziller2020-10-201-0/+7
| | | | | | | Amends 6c5eaed92ca838e68745c71ee27adb754a496b8e Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* LanguageClient: pass id as a const ref when handling client messagesDavid Schulz2020-10-193-6/+6
| | | | | Change-Id: I7ab6a7517d4dd0fe66f601661e7b3f6a7afb338b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Fix matching wildcards to full pathsChristian Stenger2020-10-193-1/+73
| | | | | | Fixes: QTCREATORBUG-24792 Change-Id: I82b4edea6260b07e1bdff065b157a4cd044ec629 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake Build: Fix missing pythonXY.zip on MSVCCristian Adam2020-10-191-6/+21
| | | | | | | Ammends 94b9b33a17e3f7760cbbf9abd021984839106647 Change-Id: I531a648a108233fbefbe6878f65f8ab7186db39a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmakeProjectManager: Make "system" execution opt-inChristian Kandeler2020-10-162-5/+9
| | | | | | | | | | It has too many side effects. Amends fcd6384f4d. T_SYSTEM and E_SYSTEM are now treated the same. Fixes: QTCREATORBUG-24551 Change-Id: Ib6df2762d329f2ddc0dd66190454159d446a9ac9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QmlDesigner: Add image cacheMarco Bubke2020-10-1610-19/+169
| | | | | | | | | | | | The image cache is saving images and icon of this images in a sqlite database. If there are no images they are generated in the backgound. The icons are fetched by item library. Task-number: QDS-2782 Task-number: QDS-2783 Task-number: QDS-2858 Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Account for qmake.bat script for Qt 6 targetsAssam Boudjelthia2020-10-151-1/+7
| | | | | | | | | | | Qt 6 targets that are built with CMake have a qmake.bat instead of qmake.exe, while they can be registered from the Qt installer using QC's sdktool, it's not yet possible to select a new version manually because the FileDialog selection offers only qmake*.exe. Fixes: QTCREATORBUG-24721 Change-Id: I647be1e0fba2f306402b8dbed747e9614a4eb0ea Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Move KitAspect related layout codehjk2020-10-092-7/+14
| | | | | | | | | | | | | | ... from KitManagerConfigWidget to KitAspectWidget (which is not really a widget, but...) The modification for the alignment handling only affect this use here. Long term I hope this can be handled centrally (e.g. always use the special form label alignment for labels in the first column when some LayoutBuilder bool property is set, instead of doing that for each use), so this is not necessarily a final API. Change-Id: I678dba45ee68ca9706569715d232f98363de8636 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Re-use BaseAspect's m_settingsKey for SavedActionhjk2020-10-094-40/+33
| | | | | Change-Id: I7ebc8013f15970a56315b3da80969808e505b3bf Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Install pythonXY.zip for qtcreatorcdbextEike Ziller2020-10-091-3/+7
| | | | | | Fixes: QTCREATORBUG-24528 Change-Id: I0db1407c17ff00a7424b8b8c229f503dc4891a12 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Qt6: Sprinkle QLatin1Strings for QStringView comparisonsEike Ziller2020-10-082-9/+9
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I2fb79bcfd0537a6704a1ee8db840401d6beca7a0 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.14' into masterEike Ziller2020-10-0812-12/+18
|\ | | | | | | Change-Id: Ie53b4c2516d80a653d51bc6b666040c586ce44ab
| * Utils: Turn the multicolored download icon into a mono-colored oneAlessandro Portale2020-10-078-6/+3
| | | | | | | | | | | | | | No need to stand out. The arrow does not necessarily have to be green. Change-Id: Ie3ae0cf1f8cef92f9c28b71ac1ed453d0e0c6f61 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * CMake build: Fix issues with exported targetsEike Ziller2020-10-063-3/+5
| | | | | | | | | | | | | | | | | | | | Remove unneeded and wrong include paths which ended up as invalid include paths in the exported QtCreatorTargets.cmake. Add missing sqlite header. Change-Id: Icce60037160ff06b032a03df47e6834422f86f57 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Merge remote-tracking branch 'origin/master' into 4.14Eike Ziller2020-10-065-48/+85
| |\ | | | | | | | | | Change-Id: I4b37b89cc1dd2c53217579ea554af0fb7994fa7e
| * | Utils: Do not emit SelectionAspect::changed if nothing changedhjk2020-10-061-3/+10
| | | | | | | | | | | | | | | Change-Id: Iac2e19d1a093f650ecde6fa9cfdec4714a8e9db4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Remove unused private functionsAlessandro Portale2020-10-085-39/+0
| | | | | | | | | | | | | | | | | | | | | As found by Cppcheck. Change-Id: I697ea69992425ff41e35990ad00be312b35ba70a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | SSH: Help preventing "Too many authentication failures" errorsMartin Kampas2020-10-071-1/+3
| |/ |/| | | | | | | | | | | | | | | | | When an ssh-agent offers many different identities, the maximum authentication attempts the server permits may be exceeded, resulting in the above error. With IdentitiesOnly enabled, just the explicitly specified identities will be used. Change-Id: Ic10d7032893a38c608989f957b5e91b7dc15c24c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Utils: Add workaround for sdktoolEike Ziller2020-10-061-0/+6
| | | | | | | | | | | | | | | | Which is compiled against an older Qt version to keep it more compatible. Change-Id: Ifee61a524055ca383c83da9f237e50536a3fd0cb Reviewed-by: hjk <hjk@qt.io>
* | Utils: Remove SavedAction::m_settingsGrouphjk2020-10-052-34/+5
| | | | | | | | | | | | | | Instead, directly use the full key. Change-Id: I8410851dd5d53f09f44cca66a9187d0b72717036 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Utils: Start replacing SavedActions by QAction or Utils::Aspecthjk2020-10-052-14/+31
| | | | | | | | | | | | | | | | First mechanical step here is to derive SavedActions from BaseAspect instead of QAction. Change-Id: I2ec95883b825462c1d867f83cc2b3bd2c2732055 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Utils: Add some function to StringAspecthjk2020-10-052-0/+43
|/ | | | | | | | | - enable/disable the widgets - enable/disable text edit undo/redo - possibly validate line edit input Change-Id: I1933a0f03404de7dcd66475f20d9b7d884ef277e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-10-026-15/+37
|\ | | | | | | Change-Id: I3f2a6c553819e992da7e9f538dc44b95b482359e
| * QmlJS: accept import without versionFawzi Mohamed2020-10-011-1/+9
| | | | | | | | | | | | | | | | | | Since Qt 6 import without version are accepted and should import the latest version. Change-Id: Id98bd0f7664dd77b30b9c91ee153fccc4160fc6d Fixes: QTCREATORBUG-24533 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * QmlJS: fix reformatting of required propertiesFawzi Mohamed2020-10-012-8/+13
| | | | | | | | | | | | Fixes: QTCREATORBUG-24376 Change-Id: I9ebe66f881575ce8e58cee46d34c3ff8da55ef9c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * QmlJS: set and propagate qtVersion in ProjectInfoFawzi Mohamed2020-09-291-2/+7
| | | | | | | | | | Change-Id: Icbeb3679c8a76c111a5e3503b2c496c28c830342 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * OutputFormatter: Run line parsers also for empty linesChristian Kandeler2020-09-251-7/+6
| | | | | | | | | | | | | | | | | | Empty lines can be relevant semantically, e.g. to mark the end of a block of messages. Amends 5cb74af166. Change-Id: I31cb32dcbf6a69f03324e0d2c00f95547c994d85 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * OutputFormatter: Prevent consecutive newlines from being ignoredChristian Kandeler2020-09-241-0/+7
| | | | | | | | | | | | | | | | | | Amends b0cad9e9c7. Fixes: QTCREATORBUG-24668 Change-Id: I19a2ea71be91ded8f2c458537dae62a3021afe52 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
| * LSP: Do not use FullyEncoded in QUrl::toStringChristian Stenger2020-09-241-3/+1
| | | | | | | | | | Change-Id: I8f978327a1d12f7d418a77ac4bc70b135142f989 Reviewed-by: David Schulz <david.schulz@qt.io>
* | ProjectExplorer: Clean up variablesChristian Kandeler2020-10-022-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global variables with names such as "CurrentProject*", "CurrentKit*" etc are harmful, because the term "current project" as used in Qt Creator does not refer to the "active project", but simply stands for the project that contains the node that is currently selected in the project tree, which in turn may or may not correspond to the current editor document, depending on the "sync with editor" setting. In other words, the "current project" is almost a random value with little meaning outside the project tree itself. Therefore, we remove "CurrentProject*" and friends, except the ones that are currently intentionally in use. The latter get renamed to "CurrentDocument:Project*", so their purpose becomes clear. Their old names are kept around for backward compatibility, but are not suggested by the variable chooser anymore, so new usages are unlikely and we can remove them at some point. We also add some ActiveProject* variants that have been requested in the past. Also remove the "CurrentSession" prefix that was deprecated six years ago. Fixes: QTCREATORBUG-12724 Fixes: QTCREATORBUG-24606 Change-Id: Ibba5d0e0ce3d2beb444a5eec01fbb9b745d90a1d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Qt6: Adapt to removal of QProcess::setupChildProcessEike Ziller2020-10-025-2/+48
| | | | | | | | | | | | | | | | And use QProcess::setChildProcessModifier when compiling against Qt6. Task-number: QTCREATORBUG-24098 Change-Id: I4166a8e27f8f63dd661df119413cd2eb2ae1dc2e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | CPlusPlus: Fix crash in FindUsageshjk2020-10-011-1/+1
| | | | | | | | | | | | | | Amends 45dd074441. Change-Id: I6d32bfe4798eca4fa5cb7786cd72e4f9e109a1b7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlJS: fix operator << of Trie to QDebugFawzi Mohamed2020-09-302-6/+6
| | | | | | | | | | Change-Id: I0a540c7b1842fff9652a7ced01697eae2e90b0e0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Qt6: enterEvent now gets passed a QEnterEventEike Ziller2020-09-298-10/+30
| | | | | | | | | | | | | | | | Add a Utils::EnterEvent for porting. Task-number: QTCREATORBUG-24098 Change-Id: I2782fe33e41a813b5562676f6dc87d6d53babdd3 Reviewed-by: hjk <hjk@qt.io>
* | Adapt to key sequence changes in Qt6Eike Ziller2020-09-292-4/+6
| | | | | | | | | | | | | | | | | | | | Use operator| instead of operator+ which was removed. Individual keys in QKeySequence are now QKeyCombinations instead of ints. Task-number: QTCREATORBUG-24098 Change-Id: I43a6122cf660e6a6de7edbf3ac9954e0a39cec06 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Remove unneeded QStringList forward declarationsEike Ziller2020-09-299-16/+4
| | | | | | | | | | | | | | | | | | Fixes build issue with Qt6, for which QStringList is now a QList<QString>. Task-number: QTCREATORBUG-24098 Change-Id: I0c81aa5bae413b836dbedea0bb6117b46f6f24c2 Reviewed-by: hjk <hjk@qt.io>
* | Revert "Utils: Remove the text option for LayoutItem"hjk2020-09-282-9/+7
| | | | | | | | | | | | | | | | | | This reverts commit 5154e1eb023ca73fe4ac24025bc6bcadd931c9f1. For some yet unknown reason, this renders the whole sublayout read-only. Change-Id: Ide1587382392a57643bed1b3cdd7d8987dbdab57 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Utils: Remove the text option for LayoutItemhjk2020-09-282-7/+9
| | | | | | | | | | | | | | | | | | | | | | This is converted to QLabels on the Qt side anyway, so we can can just do that and avoid the special casing later for form layouts later and gain the functionality for grids. Use the opportunity to make the all mouse-selectable. Change-Id: I37830b028b8d2987ea4925f364c79e905be725c8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Utils: Fix build on WindowsChristian Stenger2020-09-251-1/+1
| | | | | | | | | | | | | | Amends d97c431a007. Change-Id: I6a806048772a1e94a20d391723ad5c41886b601e Reviewed-by: hjk <hjk@qt.io>
* | Utils: Add some documentation for LayoutBuilder and BaseAspecthjk2020-09-254-13/+411
| | | | | | | | | | | | | | | | | | ... and some related classes and an enum. This is not a complete documentation for all aspect classes. Change-Id: I2d98aec012394cc4016e571884b861db7a498b1b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | QmlJS: Do not change strings referenced by QStringViewThomas Hartmann2020-09-242-10/+11
| | | | | | | | | | | | | | | | | | | | | | QStringRef is stable under reallocations of it's string()), while QStringView is not. This adds the missing changes from qtdeclarative 1b10ce6a08e. Task-number: QDS-2825 Change-Id: I120a34153424ea514abaa783f1a617ef2f8b4cf4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Utils: Consolidate LayoutBuilder interface a bithjk2020-09-243-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | - the var args template for addItems was overkill creating a lot of instantiations. Use a temporary list instead. - allow default constructed LayoutItems to be used for an empty cell, avoiding the use of a QLabel with empty text - add an addRow({...}) overload as convenience shortcut for .startNewRow().addItems({...} - rename startNewRow() to finishRow() Change-Id: I6d49dacbac3d7acf140ca526884ba1ceeeca2e0d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Utils: Determine shell from $SHELL instead of hard-coding /bin/shhjk2020-09-232-2/+2
| | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-24659 Change-Id: Icafc001b681cc76af76b8759a4de84db51146fd4 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Utils: Fix warning when destroying a grid-based LayoutBuilderhjk2020-09-231-1/+2
| | | | | | | | | | Change-Id: I816133b6b26ecaf546484b93dbc95666910f992a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.13' into master"The Qt Project2020-09-231-1/+1
|\ \
| * | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-231-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/mcusupport/mcusupportoptions.cpp Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef
| | * cdbext: fix mingw compileDavid Schulz2020-09-181-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-24653 Change-Id: I40071a0022be809266b98e1e898e969493b927aa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Utils/ProjectExplorer: Move re-usabled bits of aspects to Utilshjk2020-09-2310-3/+2389
|/ / | | | | | | | | | | | | | | | | | | | | Classes involved are BaseAspect and some derived classes, LayoutBuilder and VariableChooser. This is mostly mechanical, with various include/using changes to make it compile. Change-Id: I624a457f3555f102e541c4c71e33a9423af32250 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake build system: Propagate less target dependencies and includesAlessandro Portale2020-09-214-7/+8
| | | | | | | | | | | | | | ...and thereby have less include paths per compile unit. Change-Id: I70de8db12d881ea827595ca0cacaea13b5c0f3bd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Modeling: Fix build with Qt6Eike Ziller2020-09-213-5/+9
| | | | | | | | | | | | | | | | | | QUuid constructor with QString became explicit. QStringRef gone. Task-number: QTCREATORBUG-24098 Change-Id: I76d74bbce788c2349b777e76416ddec4a5933eb1 Reviewed-by: hjk <hjk@qt.io>