Commit Graph

57165 Commits

Author SHA1 Message Date
hjk
b95b675e41 ProjectExplorer: Pass macro expander to WorkingDirectoryAspect
... when needed to avoid a use of IRCAspect::runConfiguration.

Change-Id: I0bdae0a2a1aad4475dd3225e6ae71da7bfd9513f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-12 07:08:19 +00:00
hjk
8b24fb2a46 Debugger: Avoid two uses of IRCAspect::runConfiguration
The function is about to be removed.

Change-Id: Ib18d1c51c18a9a979395910cdcd487575061dea0
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-12 07:07:37 +00:00
hjk
679576b511 QmlProject: Pass project to MainQmlFileAspect ctor
This avoids four uses of IRunConfigurationAspect::runConfiguration()
which is meant to be removed soon.

Change-Id: I7a8f0a09b0a90042b0855b18e5be875bd343268c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-12 07:06:21 +00:00
Tobias Hunger
7264ea001b EnvironmentWidget: Do not accept empty keys or keys containing '='
Change-Id: I2b358a23ab3414cef38f60ffdba7af7d9c236568
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-11 14:16:58 +00:00
Ulf Hermann
88074a4aa8 QmlJSEditor: Remove disabled qmllookup test
This test has been disabled since Qt4 times and is unfixable. In order
to test lookup of QML types, we need to write a new test.

Change-Id: I13909c277d0b9552c158b74529c350cb28fb3794
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-11 11:59:41 +00:00
Marco Benelli
c1a761a225 qmljs: fix bug in reformatting
Reformatting multi-line comments caused, in some cases, the deletion
of the preceding line.

Task-number: QTCREATORBUG-21036
Change-Id: I9bf9627e5992e9821c0dd62a13601a3ca6367e65
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-09-11 11:57:22 +00:00
hjk
375791ec58 Debugger: Re-organize registration of sub-perspective switcher
Change-Id: Ia3559e5c4793bb297c9bdfbdf32a56d285ee0700
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-11 11:18:09 +00:00
Ulf Hermann
51adb199ab QmlJS: Fix and enable remaining pieces of importscheck test
Change-Id: Idaaf19cee1a0a971b9c3bf5ad3371a68ebd81f40
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-11 11:13:29 +00:00
Ulf Hermann
b6195f3de7 QmlJS: Fix case-fallthrough.qml test
The warning about strange interactions between QtQuick1 and QtQuick2
doesn't exist anymore, and I don't see why it would show up in that case
anyway. QmlJS::StaticAnalysis::Type used to have a member 324, and the
comment references that.

Change-Id: I4f0a256588919a146068b8771954bcabf0468dbc
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-11 10:31:31 +00:00
David Schulz
87381bbf90 LSP: use QtcProcess::splitArgs for language server arguments
Also store the executable and arguments in the stdio client to get a
more accurate comparison of clients.

Change-Id: I84fdd4ea5f32b17198d3f08e7f5d494f7fbe67dc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-11 10:04:52 +00:00
Alexis Jeandet
08508522fe Expand QTC variables from PathChooser
This would allow to use QTC variables in settings using this widget
such as Extra Debugging Helpers.

Change-Id: I8ac6de46f359f58a501f09774d992a19b48d7d5f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-11 10:00:58 +00:00
hjk
bdc1ea1d74 Debugger: Do not remember persistent layout settings per engine
Fixes: QTCREATORBUG-21006
Change-Id: Id3c2062eb5b42808d666f0fc3620a82666fe14a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-11 08:48:31 +00:00
hjk
892be5a70c RemoteLinux: Pass target to RemoteLinuxEnvironmentAspectWidget ctor
This avoids one use of IRunConfigurationAspect::runConfiguration()
which is meant to be removed soon.

Change-Id: I70a493a750e7e6baf9477552acd273c417d88289
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-11 07:55:33 +00:00
hjk
ddd46e18f3 iOS: Use an aspect for the executable
More standard pattern nowadays.

Change-Id: I1237555b44fb0a9a6faca086254c49b70c39c3b6
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-09-11 07:53:07 +00:00
hjk
69753cf9b6 ProjectExplorer: Remove direct runconfig dependency from ISettingsAspect
Change-Id: I5d8a6a31f6bf97c34163b64b8d37f9ea070717ba
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-11 07:51:11 +00:00
hjk
02d8dde4c9 Android: Use new auto aspect layout handling
Change-Id: I6e439a94f3d158d2f57ccb5c271c01c12b34eae0
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-09-11 07:47:22 +00:00
hjk
0d687b7292 QmlProjectManager: Pass target to QmlProjectEnvironmentAspect ctor
This avoids one use of IRunConfigurationAspect::runConfiguration()
which is meant to be removed soon.

Change-Id: Ib394a71b6bb7a6c028fc533656454b94895f6451
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-11 07:45:17 +00:00
Eike Ziller
a41097f66a Revert "TextEditor: Ship generic Kate highlight definition for Python"
We ship the PythonEditor which does its own highlighting, so this is not
needed for editing python. Users can still download it, but don't
ship it with Qt Creator.
This reverts commit e3d65fcf3f.

Change-Id: I6c3650419f5ecd191c11dd2abb1bf30e16e4fc29
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-11 07:27:14 +00:00
hjk
907767b89b QmlProject: Use IRunConfiguration's changed() signal
... instead of directly accessing the owning runconfig.

The removes two uses of IRCAspect::runConfiguration()
which is meant to be removed soon.

Change-Id: Ia713864f2544e3c6741482b2663ee54fd2ee80e1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-11 07:12:41 +00:00
David Schulz
ff948fad87 LSP: Do not automatically accept completion while typing
Task-number: QTCREATORBUG-21049
Change-Id: If1b944efaaf43d5e400653de9e1371d133bd1228
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-11 06:31:28 +00:00
hjk
5bc0b6ce33 ProjectExplorer: Make WorkingDirectoryAspect less dependent on runconfig
This was one of the genuine users of the run config pointer in the
aspect base class. Instead of using that stored pointer to retrieve
the relevant environment aspect pointer later, pass and store this
env aspect pointer at construction time.

Change-Id: Icbdeb9ad0fe341e4003fb544c542064801aa170f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 11:14:47 +00:00
Eike Ziller
a865fa513b macOS: Fix passing environment to terminal
We do not actually start a new Terminal process, so we need to clean up
the environment after the fact.

Clean the environment in the started shell except for some essentials,
read the config files as if for a login shell, and re-export the
environment.

There still can be differences, since environment variables set in the
user's bash profile etc will "win". This is wrong if we want to open the
terminal in anything but the "system environment", especially if the
PATH is effected, but I don't see how to solve that without severely
crippling the shell setup. This is also the current state on Linux.

Change-Id: I1d3c8184ac3bf543675e96f73253085fa6b1b29d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 11:09:31 +00:00
Eike Ziller
972cd5514f macOS: Reduce clutter shown when opening terminal
By writing the needed special commands to a temporary file.
What we cannot get rid of is the command for opening a bash that sources
that file.
Since Terminal usually opens a login shell, but we cannot set a special
file for sourcing in that case, the special commands include mimicking
the behavior of a login shell by reading the corresponding config files.

This is in preparation to setting up the environment for the shell.
Since we do not start a new process for the Terminal on macOS, we will
need to explicitly export the whole environment after the fact,
resulting in potentially dozens of export commands to be executed.

Change-Id: Ia24cf1f00e62411734f5d6514d073e11d4cdae6e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 11:09:24 +00:00
David Schulz
51e3613057 LSP: Use MimeType file filter for language servers
Change-Id: I13e06b5513c64e20590ab4caf15093a201025b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-10 10:49:48 +00:00
David Schulz
ff45c9428b LSP: return registration options only if json value contains an object
Change-Id: I775b93544636683ee8a46a4692f66770d0cc3441
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-10 10:49:40 +00:00
Thomas Hartmann
d7c5f37470 QmlDesigner: Use suffix() instead of completeSuffix()
Change-Id: Id79f2bd7472c1c20c9ac7b9f508a4dd0c9d4f3ae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-10 10:42:13 +00:00
hjk
097de6c5d0 QmlProjectManager: Aspect-ify runconfiguration
Split the remaining manually managed data into a standard ArgumentsAspect
and a new MainQmlFileAspect.

Change-Id: I8a8fe3f4a08d602a7b6e9c9463d3d7de257b6e6c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-10 10:18:27 +00:00
Eike Ziller
53f0e6c0ee macOS: Replace openTerminal.command by python script
This script will become even less trivial in the future, so use an
actually usable programming language for it.

Change-Id: I4fa1c8d327f97585bf8dde0ffaefc5fac7c1ca18
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 10:04:33 +00:00
hjk
3ffe3588d7 ProjectExplorer: Compile fix
Amends 6688623b37.

Change-Id: I89477ac44634402539fe58b243c036d478a762db
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 09:53:33 +00:00
hjk
6688623b37 ProjectExplorer: rename RunConfiguration::extraApects() to aspects()
It's the standard way nowaday, nothing 'extra' to it anymore.

Also change to ranged for when using it.

Change-Id: Ic39480e736ba09fdcafc38d5e8d16ee4ec750fdd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 09:43:08 +00:00
hjk
e7f649a194 CppToolsPlugin: Simplify setup code
Change-Id: I4d738638aa363f66b3bbfd44f866eb8fa48fa226
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-10 09:42:39 +00:00
hjk
e79bbc8bde ProjectExplorer: Fix string aspects with pixmaps in labels
Amends 0a265ce2. The feature was not used so far.

Change-Id: I6c61341aa5775db8edda66bafc557ff532508250
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 09:41:33 +00:00
Marco Bubke
3abaf647d0 Add system include path to HeaderPath and merge ProjectPartHeaderPath
System include paths are appended after other includes by the compiler. So
we should set them as system includes and not as normal includes. Otherwise
we change the include order. Headers in system include paths are not
cluttering the screen with unwanted warning and by the way improve
performance too.

ProjectPartHeaderPath was a dopperganger of HeaderPath, so we merged them.

Change-Id: I7c394b4098b697de79761499ffcd5913cc02d652
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-10 09:31:32 +00:00
hjk
59e734d9da Debugger: Rename "Snapshot" window to "Debugger Perspectives"
That's what it is nowadays.

Change-Id: I0b9c29e9adc322a923c6901b6e1f3fc9937c2892
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-10 07:49:05 +00:00
Christian Kandeler
d8ebdf1a30 Project Wizards: Update the qbs templates
- Remove the unneeded Project item.
- Remove the minimumQbsVersion property. It was originally added to
suppress warnings in some ancient qbs.
- Install applications to the bin/ directory by default.
- Add main.qml to the files list in the QtQuick template. It is good
practice to list all source files in a project file, and in this case it
is even required for building against a static Qt.
- Remove an unused file.

Change-Id: I05f36e8ae64c0a2150639760db9630dd5d613ab9
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-09-07 15:05:43 +00:00
Robert Loehning
747d1ef9f1 Remove unused variables
Change-Id: I8b49a2eea7509abb685d751a0f038dc3b4f555ca
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-07 14:02:23 +00:00
Eike Ziller
eccc24e5c9 Merge "Merge remote-tracking branch 'origin/4.7'" 2018-09-07 13:27:01 +00:00
Christian Stenger
28ab852e53 Squish: Wait for a clean shutdown when restarting QC
This fixes a race condition in tst_CSUP06 where the next run
of QC removed .user* but the first instance was not completely
finished with the shutdown process. The .user files of the project
got updated (or recreated) before the second instance tried to
open the same project again. Ensure the first instance is closed
to be sure that project's .user files got created or updated
before the second instance tries to remove and re-open them.
Follow the same approach for other tests to avoid the same issue
later on.

Change-Id: I37721f4dd647f9bbf7c6fed6e753a2906e30db81
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-07 12:48:28 +00:00
Christian Stenger
0dc1b4e7b3 Dumper: Tests: Fix handling of skipped single tests
Amends b3b4465b2.

Change-Id: Ie268a97af944d17f20077363fa37c89ad998f53e
Reviewed-by: hjk <hjk@qt.io>
2018-09-07 12:48:17 +00:00
Eike Ziller
ac9f1f798c Merge remote-tracking branch 'origin/4.7'
Change-Id: Ifb51ca9893549c478e99c9fc3ea6c32d5d5a28a2
2018-09-07 14:39:42 +02:00
Christian Kandeler
b68d943c92 QbsProjectManager: Support QML designer import paths
Task-number: QTCREATORBUG-20810
Change-Id: I1f096124f94d2c9f4ad51373bb39a212a108799f
Reviewed-by: hjk <hjk@qt.io>
2018-09-07 11:40:53 +00:00
Robert Loehning
1a64efd863 Squish: Stabilize tst_CSUP06
Change-Id: I2cac53f69d15763770fe3955408867ec668bfccd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-07 11:12:29 +00:00
hjk
b6eb350a31 WinRT: Standardize RunConfiguration display
This removes the "Launch App" label and the possiblily to collaps
the two-item run configuration which was optically different
from all but one (Android) runconfigurations.

Change-Id: I982d3690c24b3553e3a49b30209a04d0f25f348b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-09-07 11:02:53 +00:00
Leena Miettinen
fdbcfc6756 Doc: Use defines to hide info not related to Qt Quick projects
Change-Id: I70ee417aebcddd32ef9f6419e3000fdfd02c9707
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-07 08:59:48 +00:00
Leena Miettinen
aa588449b0 Doc: Move more files
To enable single-sourcing Qt Creator Manual and Qt Design Studio
Manual.

Change-Id: I88bf1f094a7ec31cce3ac2924987296f71e9cb74
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-07 08:59:31 +00:00
Leena Miettinen
07ea3b2687 Doc: Use defines in the "Keyboard Shortcuts" topic
...to enable single-sourcing Qt Creator Manual and Qt Design
Studio Manual. Update the screenshot.

Change-Id: Ia00e93c8a946564d41706e6ccbb8c0ec18647acf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-07 08:58:51 +00:00
hjk
9a0030a8ba Debugger: Make inheritance dumper test pass again
Change-Id: I2dcb6f811c34beda52e4b4d01526222b4e2abfd7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-07 08:55:33 +00:00
Leena Miettinen
29db0af9f8 Doc: Restructure refactoring information
Separate C++-specific info from QML-specific info.
Use defines to support single-sourcing. Add screenshots
that show QML code.

Change-Id: I35f01673de555074cc23e96b36200d15d6b34fce
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-07 08:44:11 +00:00
Eike Ziller
37a74cd9a3 Fix terminal command comparison
It ignored the openArgs part.

Change-Id: Ib5df9cfd424aa7bcf63b2fa5d16ece0261ef0746
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-09-07 07:07:22 +00:00
Ulf Hermann
a0e4a06f5e RemoteLinux: Remove unnecessary "--" from kill command
Apparently we don't need to prefix negative PIDs with "--" if we
explicitly give a signal number, and busybox complains about it.

Change-Id: I009cf7f2dafb3c38185e3a86146d30e47ea2e676
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-09-07 06:55:57 +00:00