Commit Graph

61529 Commits

Author SHA1 Message Date
Tobias Hunger
5a61197b94 QmlProject: Simplify code based on Project::projectFileIsDirty signal
Change-Id: I7dfce020d1091044568f5131e5026e0b819b86b9
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 12:45:47 +00:00
Tobias Hunger
929083e7b6 Qbs: Simplify based on Project::projectFileIsDirty signal
Change-Id: Idbb55851a3c6ec0c42c75eaa5c0bc89048bd5077
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-16 12:44:37 +00:00
Tobias Hunger
b8be7da158 CMake: Simplify based on Project::projectFileIsDirty signal
Delegate all the necessary file watching to Project and connect
to the relevant signal.

Server-mode insists on watching files itself, so that may not
report extra project files.

Change-Id: If821c54a7b0f8b72beed53dd1c83f255973faf3e
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 12:43:39 +00:00
Tobias Hunger
c89a8a4084 AutotoolsProject: Simplify using Project::projectFileIsDirty signal
Change-Id: Idbb81a8d3ddd2f2d81b9060f228331a233fd6ccf
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 12:43:30 +00:00
Tobias Hunger
d13307b5bf Project: Add signal triggered by project files becoming dirty
Add a signal triggered by project files becoming dirty and add
a way to register more project files than just the default with the
project.

This change enables getting rid of filesystemwatchers in derived
classes.

Change-Id: If985b46edf7cb88dd49f1c574f35cf13b5ce82d4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-16 12:43:21 +00:00
Christian Kandeler
087396fe00 ProjectExplorer: Support bulk renamings in project tree
If a user changes the name of a file abc.cpp to def.cpp, and there is a
file abc.h in the same directory, it's likely that the user wants to
rename that file to def.h. Detect such circumstances and offer the user
to automatically rename the sibling files.

Fixes: QTCREATORBUG-21738
Change-Id: Ib3ece08698a3341ef4087066d2289048f6b0fa61
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 12:28:23 +00:00
Henning Gruendl
8f9fa82880 QmlDesigner: Fix HelperWidgets ComboBox
Task-number: QDS-926
Change-Id: I77eafbf8c66b8a384dc8786726c74c89acad58ad
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-16 11:33:53 +00:00
Aleksei German
79576601db QmlDesigner Fix for Gradient Presets
Change-Id: I1d3d2f61f978c6bfb52ad4ea42f2c6756a2a0483
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-16 11:32:18 +00:00
Tobias Hunger
4e45f71339 CMake: Fix buildstep target selection
The BuildStepList is no longer a ProjectConfiguration, so this
code breaks.

Task-number: QTCREATORBUG-22818
Change-Id: I7350c0520d4b82e896761a87b52ccc1d47934530
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 11:10:22 +00:00
Orgad Shaneh
eaf8ccf118 Git: Fix branch expansion on show before the diff display is done
The description is shown first (with the <Expand> placeholder), and the
diff parsing can be long. If <Expand> is clicked during parsing, it fails
because the base directory is not set yet.

Change-Id: Ib5e839b292c32091c726f24eb643d0fa5a142cb7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-08-16 08:49:40 +00:00
hjk
596a54f645 RemoteLinux: Move EmbeddeLinuxQtVersion to QtSupport
The class uses only one ID from RL at compile time, and after the
move RL does not hard-depend on QtSupport anymore.

Change-Id: I9f8aa6782e45fe998d83ddcc5323c396964bf1fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-16 06:10:43 +00:00
Denis Shienkov
7c7201c56c ProjectExplorer: Detect ABI for GCC MSP430 compiler
This GCC compiler provides by Texas Instruments
for the MSP430 architecture.

Change-Id: I3ce330d0a14bd338f9350291242dcc434bb0d19e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-16 06:06:12 +00:00
Denis Shienkov
88c91b0586 BareMetal: Auto-detect IAR EW toolchain for MSP430 architecture
Also we introduce the new 'msp430' architecture in
ProjectExplorer::Abi.

Change-Id: Ifb857abb29d78396b0d55a4604511951597f4415
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-16 06:05:59 +00:00
hjk
0aeade8e6d CMake: Remove some nowadays unneeded build configuration fetching
Change-Id: I371492f4ba5d3e67323d725588eff03038cef90f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-08-15 13:49:41 +00:00
Knud Dollereder
2b650f713a Update the curve editor when creating a new keyframe group
Change-Id: I944754811854dba5defca812f2da7f5c086a10dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-15 13:27:47 +00:00
hjk
e73941b9a7 QtSupport//ProjectExplorer: Move DesktopRunConfiguration implementation
It does not depend on QtSupport anymore.

Change-Id: Ib2db6832fbc08d8893b362224372ef47df10ee7c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-15 13:21:37 +00:00
Christian Kandeler
98346aaab1 ProjectExplorer: Use monospace font in task tool tips for compile issues
Otherwise, error message alignment can get messed up, as the default
tool tip font is typically not proportional.

Fixes: QTCREATORBUG-18264
Change-Id: I7c827d859720c4d3a89726000f00930219c68351
Reviewed-by: hjk <hjk@qt.io>
2019-08-15 12:44:15 +00:00
Eike Ziller
59e2774d0d Qt Quick: Separate Qt Quick Designer and QMLJS editor factories
Currently the QmlJSEditorFactory hardcodes that .qml.ui files are opened
"in Design mode", without any option to explicitly open them directly in
text mode.
While this is the preferred way of working, there are always exceptions.

Separate the "Edit mode by default" and the "Design mode by default"
parts into separate editor factories. The former one is the default
editor for .qml files, the latter for .qml.ui files.

This allows users to explicitly choose "Open With > QML JS Editor" to
open .qml.ui files directly in Edit mode.

Fixes: QTCREATORBUG-18123
Change-Id: I72ab2d25fdc538210123782f6611f9c6e3157dea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-15 12:29:07 +00:00
Tobias Hunger
bc6628d037 QmlProfiler: Remove unnecessary parameter from test code
Change-Id: Ia1963e316f7c56357989440a13af5d73488ffece
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 10:38:51 +00:00
Andre Hartmann
3b41b9b24b Locator: Extract MatchLevel and use it in several filters
... that already used index-based prioritising.

There are a few more with two- or three-level priority,
but these still use the old scheme with multiple lists
good/better/bestEntries and converting them would not
gain much.

Change-Id: I21f7cfe07a3ae8183db9cb62311697d03db6e4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 09:57:46 +00:00
Cristian Adam
e1809f94ef CMake build: Fix macOS build
Current brew cmake version is 3.12, which fails to compile.

Change-Id: I2d89f5716a97a4a4d8a8e8744902e75cc19c39c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 09:41:32 +00:00
Thomas Hartmann
34f58e0fa9 QmlDesigner: Fix regression in curve editor
Change-Id: I724eef30ca046c4a9147c447577a75b84ddd6d26
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-08-15 08:58:04 +00:00
hjk
847108d4f4 QmlPreview: Pimpl plugin
This is closer in structure and timing to what others do.

Properties are left in the plugin itself in case someone uses them.

Change-Id: Ic43aea1da7e3bc56e9678144f37f5ad40ce1b20f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-15 08:19:27 +00:00
Andre Hartmann
7a5f368d9b Locator: remove outdated documentation comment
There is no function called containsWildcard()
(anymore).

Change-Id: I493646ce9d84673ca0425c87b332be2545a58295
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 07:11:03 +00:00
Tasuku Suzuki
20e7c1443e ResourceEditor: save and restore state of splitter
Change-Id: Ief14ef729e5c559e77991e00b22cb25673609a4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 07:08:56 +00:00
Eike Ziller
8201d49ea0 Merge remote-tracking branch 'origin/4.10'
Change-Id: I4d24269ef040c45e2143dfa86d1be3f7e8008521
2019-08-15 08:57:27 +02:00
Andre Hartmann
40921421ae FileSystemFilter: Convert to FuzzyMatcher
Fixes: QTCREATORBUG-18960
Change-Id: I7125362e77d7f079eec0cdcc270438cc98ca9407
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 06:54:00 +00:00
Eike Ziller
857b299356 VcsBase: Make dependency on CppTools optional
The VcsBaseSubmitEditor uses CppModelManager to collect the symbol names
from the affected files for completion in the commit message.

Move the C++ code model code into CppModelManager, register it in the
plugin manager, and call it via QObject means from the submit editor.

This avoids a hard dependency from VcsBase to CppTools.

Change-Id: I2fb34dbef153c1414820d711e7fc5596bcac1691
Reviewed-by: hjk <hjk@qt.io>
2019-08-15 06:27:29 +00:00
hjk
6b5bf41d9f Try even harder to register Utils::CommandLine and FilePath
Amends a460fa3152.

Change-Id: Id251c6ead6ca31020a3d990028a4ceac11bdac25
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-15 06:13:34 +00:00
Tim Jenssen
85cb981486 QmlDesigner: Fix potential crash
It is not crashing with 5.12.3 and 5.13.0

Task-number: QDS-916
Change-Id: I87bd83b90b1eb74c7825564ea789def52eaa8df0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-14 15:37:54 +00:00
Cristian Adam
ab9aae4856 CMake build: Build with PCH
This commit enables building with upstream CMake PCH support.

Change-Id: Ib37745b00e7560e804483e7c2c2a3fa7cf6d663c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-14 13:40:48 +00:00
Tasuku Suzuki
0e2ed9c27b Welcome: Improve buttons in Projects view
Add manage session button to session area
Move the new project button from session area to project area

Change-Id: I293793927f35f4ec0d788b4291d92c49fa560855
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-08-14 12:25:20 +00:00
hjk
6bc5b70f1d Test: Simplify TestConfiguration::completeTestInformation check
Change-Id: Ia1550b644ef0dcbabecd734f50580d4648474f90
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-14 12:05:57 +00:00
Christian Stenger
bd7f53cef8 QmakeProjectManager: Remove unused modules handling from wizards
Change-Id: If943fc306c8aaf7f8dccaeb4b833988e651108e6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-14 12:03:57 +00:00
hjk
2d9471137c ProjectExplorer: Drop filtering from KitManager::Kits
Only uses twice out of 54 cases, saves a few cycles and bytes
in the others.

Change-Id: I180005d041e3abaf841890d208adfbcb1a51fb74
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-14 12:03:28 +00:00
hjk
835ff7e692 Use pointer to member or member function with transform
... when possible.  More compact.

Change-Id: I81410b7e6d523b9405c87f70a474ded1fa9ce960
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-14 11:53:32 +00:00
hjk
d2a0b13252 AutoTest/ProjectExplorer: Move some unusual function towards only user
Change-Id: I1101a21871c8b1eac5c01afc033e5416850bc794
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-14 11:48:36 +00:00
Knud Dollereder
7a39a3c9df Include handles when computing the scene extend
Change-Id: I6a6cd17d97c7d590b329315283acdb90ab9117f1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-14 11:44:22 +00:00
Christian Kandeler
6e63a0757b QmakeProjectManager: Fix possible assertion
Amends 6c40fec9b0.

Change-Id: I11426f17a7e7a81bf4adcba742c6298f224b7ef1
Reviewed-by: hjk <hjk@qt.io>
2019-08-14 11:42:58 +00:00
Christian Stenger
10b32863ca Tests: Fix compile
Broke with e027ed5e96.

Change-Id: Ic79537865f42c4d6190d262fcf73399ed42b3035
Reviewed-by: hjk <hjk@qt.io>
2019-08-14 11:39:49 +00:00
Tobias Hunger
38e69c907b CMake: Fix marking the parsing run as successful
This missing mark prevented the Run/Debug buttons to become active
again!

Change-Id: If02f300d4bb67424398102a9ce1677f366bb5801
Reviewed-by: hjk <hjk@qt.io>
2019-08-14 10:59:45 +00:00
Henning Gruendl
f136415e8c QmlDesigner: Update GradientPropertySpinBox
Fixes the referenced bug by replacing the SpinBox used in the
GradientPropertySpinBox with a RealSpinBox.

Task-number: QDS-914
Change-Id: Iaef165d622b14575713b090c0cc8a0bbac78cabb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
qds/v1.3.0-beta1
2019-08-14 10:46:43 +00:00
Thomas Hartmann
85cebb3cba QmlDesigner: Block all mouse events in GradiantDialogPopup
Task-number: QDS-914
Change-Id: I08f9038caa947141ab202e2e5f3b00256abe8a21
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-08-14 09:58:38 +00:00
hjk
e027ed5e96 Utils: Split FilePath::fileName
Into the regular case, and a fileNameWithPathComponents() function
handling the rarely used case with argument.

This saves a few cycles in the regular case and makes the function
usable by member function pointer in e.g. Utils::transform.

Change-Id: Ic4469198c3f8a44f59e50d70e67b864d876700d5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-14 09:40:24 +00:00
Knud Dollereder
ef2c3f4e30 Add newly created properties to the curve-editor
Change-Id: I6a8b6deca7d1f1d124e4b3e2ac845bab5802cbf7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-14 09:33:03 +00:00
hjk
1ca91b16a0 iOS: Remove unused qtsupport includes
Change-Id: I0f5c867e712d152377d05c3e4105e7705e7a4547
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-14 08:37:49 +00:00
hjk
d2bb01f1fc ProjectExplorer: Mark Kit c'ctor and c'assignment as deleted
... instead of not implementing it.

Change-Id: I5f004ae5e6152bf935faa4cbc5a3b29b68e85808
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-14 08:28:27 +00:00
hjk
53f2b69124 ProjectExplorer: Inline KitManager::supportedPlatforms
... and availableFeatures into their only (local) user.
Fringe functionality that's unlikely to be re-used.

Also make kits() return value const to allow clutter-free
use of ranged for.

Change-Id: Ie36fd0b5086d7141fc1844ef9bf0477221ce5ffe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-14 08:28:14 +00:00
Tim Henning
cdf4562eb8 Tracing: Add tooltip and category color properties to TimelineModel
This doesn't change the existing behavior. The new properties are used
by the upcoming CTF plugin.

Change-Id: Ic375e8d70fdc7dbd3c124f83087a0e220a76f2c1
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-14 07:14:51 +00:00
Tim Henning
78aee4e594 Tracing: Add space between duration and time unit
According to the SI convention, there is always a space between the
number and the unit.
I think we can leave it as is for the combination of multiple units for
the sake of compactness.

Change-Id: I11efc7ec4fc54a8adbf64e51817f2f8ad567bcea
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-14 07:14:39 +00:00