Commit Graph

61529 Commits

Author SHA1 Message Date
hjk
fb631cb258 ProjectExplorer: Set up hack to funnel information to buildstep ctors
For now, store most of BuildInfo in the BuildConfiguration. This will
allow accessing it in the BuildStep ctors so the BuildSteps can
be fully setup without polishing afterwards (as currently done
in the main build steps of the three buildsystems, and Nim)

This in meant to be temporary to a large degree.

Change-Id: If6ade6052f4b96670995399ae97ef7d2313f632a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-22 11:05:04 +00:00
hjk
02707ecdad ProjectExplorer: Compactify DeploymentDataView implementation
Change-Id: I30a4a772e9a54068566be0cab435044c073becf9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-22 11:04:37 +00:00
Tobias Hunger
0c062e5827 Locator: Do not consider generated files in the project-related searches
It is unlikely that a user will want to look at generated files --
and if she wants to, there is always file search.

Task-number: QTCREATORBUG-20176
Change-Id: Iefb0aece1dbd6b39aa8892388411c10162319102
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-22 10:34:55 +00:00
Tobias Hunger
550c51c75e QmlProject: Ignore generated files
Do not bother to look at generated files. Currently this makes no
big difference, considering that there usually are no generated files
in QmlProjects. That might change in the future with asset
conditioning though.

Change-Id: Ia773f09343efe5ebb006c69e4f41d724bba42d86
Reviewed-by: hjk <hjk@qt.io>
2019-08-22 10:34:48 +00:00
Christian Kandeler
567a0db6dd Utils::Environment: Consider target OS type when sorting
That is, use case-insensitive sorting on Windows, so that e.g. "Path"
will not appear after "PROCESSOR_REVISION".

Fixes: QTCREATORBUG-22786
Change-Id: I42d469b6079037d1062dbd5b273f5aa8ade25e79
Reviewed-by: hjk <hjk@qt.io>
2019-08-22 10:29:22 +00:00
Eike Ziller
c1e2720bed Boot2Qt plugin is disabled by default but not experimental
Change-Id: Ie962be78d62aa57e86c0bb8d45010b93e725ce97
Reviewed-by: hjk <hjk@qt.io>
2019-08-22 10:12:13 +00:00
Eike Ziller
30143478f3 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	src/libs/utils/consoleprocess_win.cpp

Change-Id: Ibdc265eed2f7080726e11ff6f2931c8559943af2
2019-08-22 09:53:37 +02:00
Christian Stenger
8cd7a11926 AutoTest: Fix handling of unnamed QuickTests
..now that the parser understands multiple TestCase items
inside a single qml file.
As long a test function is located inside a different TestCase
it is considered as a different one, so treat test functions
even of unnamed test cases correct.

Change-Id: I5cbfe1f63f896317523d51bbf67ea59169481a71
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-08-22 06:50:05 +00:00
hjk
d0bdfad932 QtSupport: Pimpl BaseQtVersion
Too much for a public header.

Also, lump the implementations of BaseQtVersion and QtVersionFactory
into a common .cpp. The classes are tightly coupled, having them
in one place allows to get rid of several accessors in their
interfaces.

At least ProString vanishes from the .h, and thanks to C++'s
peculiar idea of object constness, we can lie less obviously
in the implementation about effectively mutable data members.

Change-Id: Ibf594d71dcba163d6f09ba65e3ecb76174295099
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-21 11:59:38 +00:00
hjk
f29756b069 ProjectExplorer: Use a plain QWidget base for deploy config widgets
The only extra feature of a NamedWidget is not used.

Change-Id: Ia85e8e8fba3a3fb60d3f28709c790efea0a30de0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-21 11:58:11 +00:00
Christian Kandeler
4fba896d66 App output pane: More fine-grained popup options
Let users specify that the app output pane should pop up only on initial
output.

Fixes: QTCREATORBUG-22844
Change-Id: I13d44af8edebac151b81d7b49fb0640e251ea3ab
Reviewed-by: hjk <hjk@qt.io>
2019-08-21 11:52:00 +00:00
Christian Kandeler
020c2914c3 ProjectExplorer: Do not disable run configs because of project parsing
After project parsing has ended, the run configurations are set up from
the information provided by the parse, and that information is valid
until the end of the next parse. There does not appear to be a reason to
prevent users from e.g. editing command line arguments or starting the
application just because the project is currently being parsed.

Task-number: QTCREATORBUG-22548
Change-Id: Ib5e77c747fc2483650bcab22e07881ee7d93500b
Reviewed-by: hjk <hjk@qt.io>
2019-08-21 11:31:31 +00:00
Alessandro Portale
09cb507f4f WebAssembly: Remove unused and unimplemented class
Change-Id: Ia94fd2110a77acc79181431b5a5b809f1f9b0a9b
Reviewed-by: hjk <hjk@qt.io>
2019-08-21 11:27:21 +00:00
Tobias Hunger
988d376ad0 ProjectExplorer: Handle parsingStarted/Finished in BuildConfiguration
Make all buildconfigurations disabled while the project parses.

This unifies how this is handled in different build systems.

Change-Id: I6afca3743ad1433529a4f9d3bfdf73042799e456
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-21 08:32:22 +00:00
Tobias Hunger
183f01cc1d ProjectExplorer: Fix potential nullptr access
I am pretty sure this can not get triggered by the actual code, but
let's be safe.

Change-Id: I12d281765e44fbeab0cb14f7d2cc3312da28fa69
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-21 08:32:14 +00:00
Friedemann Kleint
abe3dde5d6 ConsoleProcess: Build against 5.14/MSVC
Fix
consoleprocess_win.cpp(382): error C2668: 'QListSpecialMethods<QString>::join': ambiguous call to overloaded function
/src/corelib/text/qstringlist.h(243): note: could be 'QString QListSpecialMethods<QString>::join(QChar) const'
/src/corelib/text/qstringlist.h(233): note: or       'QString QListSpecialMethods<QString>::join(QStringView) const'
consoleprocess_win.cpp(382): note: while trying to match the argument list '(char)'

Change-Id: Ib1dae4e45c7a9d27f780245ac38952740562b4bf
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2019-08-21 08:31:15 +00:00
Christian Kandeler
6d3f236aab Utils::Environment: Use expanded values
The Environment class is supposed to support values with references to
other variables, but we failed to actually expand them in most places.

Fixes: QTCREATORBUG-22687
Change-Id: I108cb59d3b4571471423455240f6f4f1cf64bf05
Reviewed-by: hjk <hjk@qt.io>
2019-08-20 12:39:16 +00:00
hjk
30dc401429 QtSupport: Move extracompiler factories to plugin pimpl
Same lifetime, less line noise than with the QObject parent.

Change-Id: I450f5a8881f872adeedf34e3edfe3517fd670ad8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-20 11:12:33 +00:00
hjk
423f516cf5 ProjectExplorer: Remove Project::aboutToRemoveProjectConfiguration()
Nobody listened to that signal.

Change-Id: I456d663fdec7ac67507a8f9f7ed1e5d7b520b7cc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-20 11:05:03 +00:00
hjk
ff277923d9 ProjectExplorer: Add a facility to dump supported run worker setups
Essentially walking the RunModes x RunConfigs x Devices cubes.

Information is just the factory pointer, or null, some name would be
nicer, but for now it turned out to be sufficient.

Change-Id: Ifdf92b2353cb5c0346ee4566beb7d78a00645aed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-20 10:56:06 +00:00
hjk
583cf69391 QtSupport: Move qmlsceneCommand down to BaseQtVersion
This had already accessors to all kind of commands, having also
qmlsceneCommand there makes it more consistent and lets us un-export
DesktopQtVersion.

Change-Id: I3ba5a840125b2b1197abb1564b7906571230f2c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-20 10:37:40 +00:00
hjk
9d206a2bc4 ProjectExplorer: Hide parts of BuildStep's QObject-ness from users
This lets the compiler catch issues like QTCREATORBUG-22818 and
saves visible casts on the user side.

Change-Id: I5a307a55364daa0bec039a4c38cc9827841ff9c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-20 10:35:57 +00:00
Christian Stenger
e425706c4d QmlDesigner: Fix build with namespaced Qt
Broke with 309021a73f.

Change-Id: Ie3e22d7231ed00b498aca234456a2881c10b13bb
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-08-20 09:07:56 +00:00
hjk
6f949ebf18 Android: Simplify AndroidExtraLibraryListModel::data()
This was triggered by a warning on a empty expression statement,
but it turns out that QDir::cleanPath calls can be avoided, too.

Change-Id: I930cbb1272294f57794c29e0cd48e3c0ba8c6fdf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-08-20 08:44:33 +00:00
Tobias Hunger
d272a64eab Project: Remove Project::document() method
The document is used to do file watching, which may or may not be
ideal. So make sure we do not leak the information how we watch
files into the API and its users.

The method is not used sensibly anywhere in creator, so it seems
safe to remove it entirely.

Change-Id: Ieed755bd5c852875378e4e96665dc906499975b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 14:27:06 +00:00
Tobias Hunger
109a8b1829 ProjectExplorer: Clean up Project
Change-Id: I870ef9f57e1a3ae3bc61351322c71d3ce5381d98
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 14:26:50 +00:00
Tobias Hunger
abebbdc9f7 CompilationDatabase: Simplify based on Project::projectFileIsDirty signal
Change-Id: Icfcbae73f611d967a7cc2db7c249f6f7190f5926
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 14:26:30 +00:00
hjk
f187ddd590 iOS: Put common IosDevice constructor code into a function
It is not even clear that the remaining difference are needed.

Change-Id: Ic4418143242793d82a1f4c4c368af69a2e537078
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 13:51:56 +00:00
Eike Ziller
14da061c33 Android: Warn if sdkmanager could not be run
Add a line in the error checking for "SDK manager runs"

Fixes: QTCREATORBUG-22626
Change-Id: I63f783b376056a28c106bad1ce8c874acf6897f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-19 13:50:15 +00:00
Aleksei German
39e5cef301 QmlDesigner Fix for the BindingEditor
Change-Id: Ic0747bdd449a33ce7dd4b4094adfbbff259a4ee3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 13:38:38 +00:00
Christian Kandeler
37a2bbe14e Utils::Environment: Remove another set of duplicate functions
More clean-up after 4bae5de36b.

Change-Id: Ia60cb868c464627b42a94d502d301b175449aa17
Reviewed-by: hjk <hjk@qt.io>
2019-08-19 13:11:01 +00:00
hjk
3bf3feb33c QmlDesigner: Reduce visible use of QWeakPointer
So it's easy to spot and later double check the use of the remaining one.
Most typedef have not been used anyway.

Change-Id: Iaa904ef72434b37b1dda42b157952869e578cb08
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-19 12:42:12 +00:00
Thomas Hartmann
8b2ac90bb3 QmlDesigner: Open dialog asynchronous
Change-Id: I4229ebb813d09680e6838f90469e7bb95b919f56
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-08-19 12:39:31 +00:00
Aleksei German
c51da3805d QmlDesigner Fix for GradientDialog selected item
Change-Id: Ie7f7a7ad79e3e9bcb796f0fedc3b7d5d9cd8b023
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-19 12:36:34 +00:00
Aleksei German
309021a73f QmlDesigner New Binding Editor
Change-Id: I75597a575cf4c6b8c0795d9f83a245539efb9ed8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-19 12:35:24 +00:00
Eike Ziller
a1d48830b1 CMake build: Make it possible to put plugins into Qt Creator build
In the super repository builds we want all plugins to end up
at a single place, so running the build result includes all plugins,
even without an explicit install.

With this patch we can set QTC_MERGE_BINARY_DIR in the super
CMakeLists.txt to achieve that.

Change-Id: I8b590e5a521a06aa5a8f00ef0e60f5c3b4349ee2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-19 12:11:10 +00:00
Sergey Belyashov
093d8100b7 Update Russian translation
Change-Id: I064a68aed8963e9706f36c861e92b36ac0831096
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2019-08-19 11:30:57 +00:00
hjk
a11320bbe9 More on QTime::start() deprecation
Change-Id: Icb53308b5eb95dfc2ae39e221677471ff260a2c1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-19 10:53:00 +00:00
Christian Kandeler
9f88fc881f GenericProjectManager: Support framework paths
Rather than adding yet another meta file, we use the .includes file with
a special line prefix.

Fixes: QTCREATORBUG-20099
Change-Id: I494e0143b8e0f1f8828a56d7487b2201f1680337
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-19 10:44:08 +00:00
hjk
2689f837f3 QmlDesigner: Remove a deprecation warning on QPixmapCache::find()
In this case the alternative has been around for long, and is being
used elsewhere in Creator code.

Change-Id: Ifafda47d31a8073fcf95e2ceeb073ca1468f13f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-19 10:41:04 +00:00
hjk
4307758e4b Debugger: Remove unused QmlEngine::startupMessageFilterConnection
Change-Id: Ifeda7c4956d6abdfc06f602d4e3011a6056e3186
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-19 09:51:03 +00:00
hjk
ecc698a416 Debugger: Remove unused QmlEngine::sourceEditors
It look like it has been always empty for a while.

Change-Id: I4d169294a93f22ffa6a49203e2cd34a9e0bf924c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-19 09:50:50 +00:00
Leena Miettinen
6ff6189cb5 Doc: Remove section on Checking JSON data structure
As the feature no longer seems to work.

Fixes: QTCREATORBUG-21024
Change-Id: I29cb03d70d5a5668b40066c9c6f75650dae65d44
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-08-19 07:48:42 +00:00
hjk
5354a023b9 ProjectExplorer: Remove unused IDeviceWidget parent parameter
Change-Id: I30976a8303b1ad5154aaaabceac7e531c720df83
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 07:45:11 +00:00
hjk
fe6b954304 ProjectExplorer: Remove unused DesktopDeviceConfigurationWidget
Change-Id: If5717a7acb8aae555370245879afc398d5a05f61
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 07:44:58 +00:00
hjk
36d98d4af7 ProjectExplorer: Base IDevice::osType on a data member
Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 07:44:45 +00:00
hjk
b6618ab632 RemoteLinux: Remove direct dependency on QtSupport
No real impact as it is still pulled in by the debugger, but...

Change-Id: I813e1e99474dc0ec7d4089c548b544fd351dc9f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-19 07:44:27 +00:00
Eike Ziller
42b8a22840 CMakeEditor: Add fallback help ID
Like we do for the BaseTextEditor.
This allows users to get context help also for items that are not
"commands", like various variables that have a meaning for CMake.

Change-Id: Ie1af61bdffdeecb406b1dc7e6127000c17ea5a8e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-08-19 06:49:56 +00:00
Tobias Hunger
22092ee4e6 GenericProject: Simplify code based on Project::projectFileIsDirty signal
Change-Id: I3e9eb892f22c716c3b6cf40498f232d234aa163e
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 12:46:13 +00:00
Tobias Hunger
007d134bc3 Python: Simplify code based on Project::projectFileIsDirty signal
Change-Id: Ife19edf47b903080c073ffef844074be48b65b23
Reviewed-by: hjk <hjk@qt.io>
2019-08-16 12:46:02 +00:00