aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update Qbs submodule to the top of 1.21 branch"v6.0.0-beta2Eike Ziller2021-10-271-0/+0
| | | | | | | | | This reverts commit 9edecd1c94656eedf6293b4749ba84a968c4aa25. Reason for revert: Broke the build on Windows: LINK : fatal error LNK1104: cannot open file 'lib\qtcreator\qbsvariant.lib' Change-Id: I393a8eb90ed21344d6ff6d9e87a5b421b5cb9491 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* CppEditor: Make pure virtual functions opt-inChristian Kandeler2021-10-271-3/+8
| | | | | | | | ... in the "Create implementations for all member functions" quickfix. Fixes: QTCREATORBUG-26468 Change-Id: I0965290c38cc66cffaf5dd3871eb96b6ff24b4d2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ClangCodeModel: Adapt test to upstream fix in clangdChristian Kandeler2021-10-271-3/+5
| | | | | | | See https://reviews.llvm.org/D111224. Change-Id: Id880468976e9036aa0c6212905101050ff43e34b Reviewed-by: David Schulz <david.schulz@qt.io>
* CppEditor: Follow symbols in generated UI headers to .ui fileChristian Kandeler2021-10-271-4/+34
| | | | | | Fixes: QTCREATORBUG-2374 Change-Id: I784fe39c11c834525cdd37ca719efa65efcb307c Reviewed-by: hjk <hjk@qt.io>
* QmlJS: fix building testsDavid Schulz2021-10-271-1/+1
| | | | | | | amends d68bb4687c4cce9087ff627b1257edc7cd440aba Change-Id: I7fc5b260a7748829038b8494e75e4cfc5a56945b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Doc: Update the Qt Quick Mobile application tutorialLeena Miettinen2021-10-2710-283/+276
| | | | | | | | | | | | | Remove references to using visual editors and use the example code from Qt Sensors module. Add instructions for using CMake. Add CMakeLists.txt, AndroidManifest.xml, and Info.plist files. Change-Id: I956379fdf7d39161f571893d56250ec2dd2f5ddd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* QmlJS: Proliferate FilePath and QtcProcess use in QmlJSPluginDumperhjk2021-10-275-57/+54
| | | | | Change-Id: Ie483bb2e9b5d812d380470949564a6bc57801fa9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: fix clipboard collecting via mouse selectionsDavid Schulz2021-10-271-1/+21
| | | | | | Fixes: QTCREATORBUG-26471 Change-Id: I08264204c5ea5753b326417e5ba3a451cc6ef8f6 Reviewed-by: hjk <hjk@qt.io>
* Use a new enum indicating various start failuresJarek Kobus2021-10-272-19/+22
| | | | | | | | | | | | | | | | | Before the m_startFailure flag was used to detect the case when the process failed to start because of wrong filename. As this flag was set on any possible error we have always detected the wrong filename case. Replace this flag with a new enum describing various start failures. Don't report again the crashed message. Check if we have already reported the stop and we don't report it again. The processExited() handler is being called twice: directly from localGuiProcessError() and through the delayed localProcessDone(). Fixes: QTCREATORBUG-26467 Change-Id: I3cc6aa0c0b702256cefd77ba95793cd31e82ae10 Reviewed-by: hjk <hjk@qt.io>
* Docker: Remove DockerRunConfigurationhjk2021-10-276-188/+3
| | | | | | | | | | | | | This was a helper in the initial work on docker support which has been commented out for a while already. Using "docker runconfig" would technically work, however, this is conceptionally the same as the old "matrix problem": We'd need docker-specific almost-duplicates for every existing non-docker runconfig. This does not scale. Change-Id: Idf96abb6487903fdb89e7168a5ed78b9dc9dcecf Reviewed-by: David Schulz <david.schulz@qt.io>
* Don't instantiate QTimer and QEventLoop for every QtcProcessJarek Kobus2021-10-271-9/+15
| | | | | | | | | | | | | | These two objects are only used when QtcProcess::runBlocking() with m_processUserEvents option set is called, otherwise they are unused. Create them only when they are needed. This also solves the issue that these two QObjects were not moved together with QtcProcess when it was moved to another thread. Change-Id: I7de6a92a51fc249184fc5811dac7a7bbf05d351f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* McuSupport: Fix some warningsChristian Stenger2021-10-272-2/+3
| | | | | Change-Id: I641a31ed18bb804ffe081852dcfb39499f24c30f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Debugger: map stack frame paths to the device of the debuggerDavid Schulz2021-10-271-1/+2
| | | | | Change-Id: If20617faf63a6b934455267f5e9512e5c555e144 Reviewed-by: hjk <hjk@qt.io>
* Debugger: show destribution debug package message for remote framesDavid Schulz2021-10-271-1/+1
| | | | | Change-Id: Ie9f7b553357c0f041d266874d284504159708cd9 Reviewed-by: hjk <hjk@qt.io>
* Debugger: use FilePath in stack framesDavid Schulz2021-10-2712-50/+55
| | | | | Change-Id: I98b6aa60e1b72be3482916446b87cee89e6cf2a4 Reviewed-by: hjk <hjk@qt.io>
* Debugger: adjust inferior paths for remote debuggerDavid Schulz2021-10-271-2/+7
| | | | | Change-Id: I251c7a69b6595848c737c2547d22d8e0a4f2076a Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Compile fixhjk2021-10-271-1/+1
| | | | | | | Amends a393bcec38f. Change-Id: I00868a0de43d86b435f64e97725a0a66bd01266e Reviewed-by: hjk <hjk@qt.io>
* Update change log for 6.0Eike Ziller2021-10-261-1/+37
| | | | | Change-Id: Ifb0aacc979910a9de1ea56d9ed31f856a0dbf376 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android: drop const from AndroidConfigurations::currentConfig()Assam Boudjelthia2021-10-2611-16/+16
| | | | | | | | | | | Since the config can be expected to modify configuration values (e.g. setEmulatorArgs()) it shouldn't be const, but can be set to const whenever creating a reference that is not meant for modifying the config. Change-Id: I8c816a5422d4d57afa158c723d908e3a9a9a0db8 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Expose state property for 3DObjectsHenning Gruendl2021-10-263-18/+30
| | | | | | Task-number: QDS-5225 Change-Id: I08b5839ef70dd3e3ea9ebd615646494e3667a479 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix hex label eliding in ColorEditorHenning Gruendl2021-10-262-3/+3
| | | | | Change-Id: I144511f8cfe4caabaf84d19331a6cb4222884cdf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix GradientPropertySpinBox draggingHenning Gruendl2021-10-261-2/+4
| | | | | | Task-number: QDS-3081 Change-Id: Ibcd7d79fbff42bb41a009de37f7200aa50b56827 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* McuSupport: support for SDK 2.0Christiaan Janssen2021-10-2611-142/+374
| | | | | | | | | | | | | | | | | | | | This is a quick fix for the current situation. Proper support will need a rewrite of part of the plugin code. QtQuickUltralite SDK 1.x relies on environment variables for the dependencies. SDK 2.x uses CMake variables for that purpose. Some of the variables have been renamed, others grouped together. Here a mapping between those is hardcoded as an urgent solution. A proper implementation should make the plugin independent of the existence or lack of specific environment variables. Also, all the hardcoded information needs to be moved to the json kit files in the SDK. Otherwise, compatibility breaks between versions every time the built-in assumptions relating to that information change. Task-number: UL-4396 Change-Id: I7f40a694a773881f20b29bae9d02c7c1c8bd747b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Update Qbs submodule to the top of 1.21 branchIvan Komissarov2021-10-261-0/+0
| | | | | Change-Id: Ia722129e6c0b25c20600a9191656ee70af32435d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Add and organize error cases for different stepsAssam Boudjelthia2021-10-265-109/+166
| | | | | | | | | | Add error messages for cases in the different steps (e.g. build, deploy, etc.) for user. This makes it easier for the user to know what's wrong instead of just failing with no explanation. Change-Id: I96ea65f5c73edf14c2214b699503211b740d029c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Recognize subfolders as modules at any depthMiikka Heikkinen2021-10-263-15/+46
| | | | | | | | Fixes: QDS-4787 Change-Id: If4e474ba0bc5f23e8a3cbf7bc6b5c7715fe467dd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
* macOS: By default use dark theme in system dark modeEike Ziller2021-10-263-0/+26
| | | | | | | | Like already done for Windows. Change-Id: I7919ecb92da5d4baeedf2068f09c341d39728ecc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* macOS: Force light appearance before saving system paletteEike Ziller2021-10-263-9/+24
| | | | | | | | | | | | | When using a light theme while macOS is in dark mode, we need to first force the application appearance to be light, before saving the system palette. Otherwise the system palette will contain colors from the dark system appearance. Fixes: QTCREATORBUG-21520 Fixes: QTCREATORBUG-26427 Fixes: QTCREATORBUG-26428 Change-Id: Icf802093de17715d16db5c5735b133f2fc465436 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake file generation: Generate main.cpp and main.qmlTapani Mattila2021-10-266-16/+148
| | | | | | Task-number: QDS-5254 Change-Id: Ide893002df72adde77ef018482a4bd13c207780f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix CMake file generation to include module subdirectories properlyTapani Mattila2021-10-262-9/+30
| | | | | | | Task-number: QDS-5273 Change-Id: Id32ef746851a51a54941359548d0e35608f282a5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Do not create pixmap at component completionMiikka Heikkinen2021-10-261-7/+3
| | | | | | | | | | | | | | Creating an item pixmap will render the entire scene and clear all dirty flags, so we don't ever want to render just one item without checking if other items need rendering, too. So pixmap creation is removed from completeComponent(). Since completeComponent() already inserts the completed instances to the dirty instance set, this should not cause any problems; it just defers the rendering to the next collectItemChangesAndSendChangeCommands() call. Fixes: QDS-5271 Change-Id: Ic15dbb29f13875b966f4e3c3556a4ecd7194cdd6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* iOS: Fix retrieval of developer teams with Qt 6Eike Ziller2021-10-261-5/+11
| | | | | | | | | | | Qt 6 fixed the representation of certain plist file structures in QSettings. This leads to a different layout of the QVariantMap that we get for the information about developer teams. Fixes: QTCREATORBUG-26111 Task-number: QTCREATORBUG-24098 Change-Id: I18514bda4d9a96bbbf13ed0b7159019778d0862d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QML Designer: Fix UI text capitalization and punctuationLeena Miettinen2021-10-262-4/+4
| | | | | | Task-number: QTCREATORBUG-26458 Change-Id: Ifffb7e155bf75a47dec9d4bd9842c4acd5aaf2a7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Inject QtQuick.Controls into possible imports if necessaryMiikka Heikkinen2021-10-261-1/+28
| | | | | | | | | | | | | | | In Qt6, QtQuick.Controls module itself doesn't contain any versioned types, so it will only appear as unversioned module in the QmlJS snaphot. It is still valid import, as behind the scenes it will import QtQuick.Controls.impl, which has the versioned types. However, QmlJS can't handle this case, so we work around it by including QtQuick.Controls as a possible import if corresponding .impl is a possible import. Fixes: QDS-5182 Change-Id: I6cc73ccaee0c16f0bcd09e4279cba411a76b45f2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Handle implicit components properly in componentviewMiikka Heikkinen2021-10-262-44/+61
| | | | | | | | | | Made component view react to node source changes in order to properly show implicit components in the edit subcomponents dropdown. Fixes: QDS-5237 Change-Id: Ibe39e6f5c30f19e4067f8cbc95f240d82165e982 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add a Text component when dropping a font to Form EditorMahmoud Badri2021-10-261-1/+9
| | | | | | | | | When dragging a font from the file system and dropping it on the Form Editor, create a Text component. Fixes: QDS-5272 Change-Id: I3ec9420f870732afac7d09688f1e459881d4aad3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Open project folder in File System viewEike Ziller2021-10-261-2/+7
| | | | | | | | | | | | If no editor is open and syncing of the root is on (the default): - make "Projects" or the last opened project the default root - switch to project root when project is opened If an editor is open, everything stays as is. Fixes: QTCREATORBUG-23632 Change-Id: Ie409e2ef676fe933cb4b7f32f2347fea19e5927e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Docker: Map build directory to device in cmake callsDavid Schulz2021-10-263-14/+18
| | | | | Change-Id: Ibcd2e1aebac337e880a28a2a22b35d8ca60b6dcf Reviewed-by: hjk <hjk@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.0' into 6.0" into 6.0The Qt Project2021-10-2611-118/+270
|\
| * Merge remote-tracking branch 'origin/5.0' into 6.0Eike Ziller2021-10-2611-118/+270
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidpackageinstallationstep.cpp src/plugins/cppeditor/cppmodelmanager.cpp Change-Id: I3bad38e1cfe717e98209d49461c9813a8e555eff
| | * Android: get build dir based on settings file path for qmake projectsAssam Boudjelthia2021-10-252-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check Constants::AndroidDeploySettingsFile path first, and use the buildTarget's workingDir only if that former value is empty. Fixes: QTCREATORBUG-26357 Change-Id: I726a4b5cd60042845988b4428eea03ef0adb9920 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| | * CppEditor: Make sure fallback project part is up to dateChristian Kandeler2021-10-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with regards to the session include paths. Amends 0636238429. Fixes: QTCREATORBUG-26323 (cherry picked from commit 8c86b9bca17da149bb6668960af2da8f13d88f93) Change-Id: I972a314db607d0b06859744dec4c83e885be3b5c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: David Schulz <david.schulz@qt.io>
| | * Update details about LLVM/Clang in acknowledgmentsKai Köhne2021-10-212-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLVM moved to github a while ago - the old svn repositories are dead. Furthermore, (almost) all of the code is now under the "Apache 2.0 with LLVM Exception" main license (see also https://foundation.llvm.org/docs/relicensing/) Change-Id: I8319f8479357c6182c5bf78b1ee7fe202e666980 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Doc: Update the Scene Environment TopicJohanna Vanhatapio2021-10-216-88/+247
| | | | | | | | | | | | | | | | | | | | | Task-number: QDS-4888 Change-Id: I63d17e02054a2a475e43f1e0ac9c5691422cf703 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * Doc: Fix links to QDS tutorial imagesLeena Miettinen2021-10-201-2/+2
| | | | | | | | | | | | | | | Change-Id: I31315c9512e9fbad5f7462e5e82ba72666bb5719 Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
* | | Utils: Map local path path in FilePath::onDevice(), toohjk2021-10-261-2/+8
|/ / | | | | | | | | | | | | | | To cover cases like Windows -> Docker/Linux, where these parts are not an exact 1:1 mapping. Change-Id: Iecc26e06771fb190644988950271ff7990962b6b Reviewed-by: hjk <hjk@qt.io>
* | Docker: allow local build directoriesDavid Schulz2021-10-261-2/+1
| | | | | | | | | | | | | | Used for local projects with kits that have a remote build device Change-Id: I8604c4673fc0f1571fe62407334c1e26e71fd2a8 Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: introduce Toolchain::priorityDavid Schulz2021-10-265-6/+30
| | | | | | | | | | | | | | | | Can be used to prefer certain toolchain types over other if different toolchains matches the same abi. Change-Id: Ie1c62e8abfc98e8cda7f999c4df487799c8d4f13 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmlJS: Update version informationChristian Stenger2021-10-261-1/+126
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-26273 Change-Id: I3a2c7c0d11436655a87d6288412af95ff3ffdaaf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Debugger: Fix UI textLeena Miettinen2021-10-251-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-26458 Change-Id: I6625d30e2eb2d2fcca87360f84d50109632071f2 Reviewed-by: hjk <hjk@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 17:00:39 +0000