Commit Graph

52993 Commits

Author SHA1 Message Date
Ivan Donchevskii
5c554c0de9 CppTools: add multiple refactoring engines support
Make model manager able to select the most functional
refactoring engine from the available ones.

Change-Id: I74031c910706fd694a0a7def022531501f1ea005
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-17 13:32:51 +00:00
Andre Hartmann
57e35274c2 Wizards: Prettify template QMake project files
Having each source/header/form file on its own line
makes further moving around (e.g. sorting) much easier.

Also bring indentation for source/header sections to
the same level.

Amends commit cf40d98dc9

Change-Id: I95ad9c9298ae01e548a595b29d7f7651220adadd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 10:29:41 +00:00
Tim Jenssen
562fd0a040 ProjectExplorer: code sugar
Change-Id: Ia78fd000a4836fa54567bc57ef401eedb3dcc7b4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 09:17:35 +00:00
Ulf Hermann
afbffb01fa QtSupport: Don't try to get Qt version if QtVersionManager isn't loaded
Otherwise we get a soft assert there.

Change-Id: I701672d1f479f2281c85fa1bc77fa2216b0b0d98
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 09:01:57 +00:00
Orgad Shaneh
2310ec5891 Gerrit: Support Private/Work-In-Progress push on Gerrit >= 2.15
A private change[1] is only visible to the uploader and reviewers (like
draft in older Gerrit).

A WIP change[2] does not generate notifications until it becomes ready.

[1] https://gerrit-review.googlesource.com/Documentation/intro-user.html#private-changes
[2] https://gerrit-review.googlesource.com/Documentation/user-upload.html#wip

Change-Id: I4905461c529e93e86be934c60eab218ff7474fcd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 08:58:14 +00:00
Tobias Hunger
95bd5b0d68 ProjectTree: Fix soft assert
Fix soft assert when accessing the lone project file node in a project
that failed to parse.

Change-Id: I73d9b0012292dd5516a0a9c81cdc4003eebf2a92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:17:02 +00:00
Tobias Hunger
3d0339844e ProjectModels: Use better way to retrieve project
Use a better way to retrieve the project from a containernode.

Change-Id: I8b0a0aa86e823ef3b9cab512a1374f7fb77f1aa3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:16:49 +00:00
Tobias Hunger
7cba979840 ProjectNodes: Remove unused member
Change-Id: Iaeca64c025a870ce83f9d806fdd3e086599046d5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:16:32 +00:00
Tobias Hunger
1a5eaecd97 Project: Avoid unnecessary activeTargetChanged signal
Make sure to create the active target first when reading a project
for the user data. This implicitly sets this target to the active one,
avoiding one spurious activeTargetChanged signal.

Change-Id: Iff9b19ed25bac9809ae75489ae159ffb66e71cb4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:16:25 +00:00
Orgad Shaneh
be3254c7c3 Gerrit: Resolve version also for valid servers
Change-Id: I2d02aec89bf5d7afe1d173fb5054f92f9bf1c3bf
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-17 06:27:14 +00:00
Ulf Hermann
d386b4ed6d QmlDebug: Extract a general QML debug connection manager from QmlProfiler
We can use it for other QmlDebug run controls, too.

Change-Id: Iee1cd592848ef4c48954a2674b6fa509223fcda4
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 14:04:24 +00:00
Ulf Hermann
a54685aa59 QmlDebug: Use versioned packets for engine control client
The service also uses versioned packets and not doing this might create
subtle bugs.

Change-Id: I54dfbe4f8e3d3a71daf2fe503a609c52c6a158bb
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 13:57:27 +00:00
Orgad Shaneh
c19c2551fb Gerrit: Move push target logic to GerritPushDialog
Less indirection + will simplify new private/wip flags.

Change-Id: If8c4072b6456b4044d83ef17e130e0360a1d05f8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-15 16:44:59 +00:00
Orgad Shaneh
7a04014f9f Merge remote-tracking branch 'origin/4.5'
Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
2017-10-15 00:23:08 +03:00
Orgad Shaneh
b67bf73dc7 Debugger: Fix run in terminal
setUseTerminal was called before the engine was set. Reordered it.

Task-number: QTCREATORBUG-19056
Change-Id: I43f2aebaf72a904ea3a3bcf03cd41186b191b209
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-10-14 16:35:16 +00:00
Alessandro Portale
81c5906970 Valgrind: Remove dead code
Change-Id: I77fdb0f07dabf742bccd88016463b01f45c011ca
Reviewed-by: hjk <hjk@qt.io>
2017-10-13 19:56:37 +00:00
Tobias Hunger
271635ed1f QmlDesigner: Remove unnecessary destructor
Change-Id: If4a9e6a8f252f00feecb298022dc0065dbda44a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-10-13 18:08:29 +00:00
Filipe Azevedo
e1ff09f332 Fix memory leak
This is not really a leak because they are owned by the main window.
But they accumulate in memory for nothing.

Change-Id: I521f3c9e3e535cd22ae27c974257866d1d6403b7
Reviewed-by: hjk <hjk@qt.io>
2017-10-13 16:43:35 +00:00
Jake Petroules
e2bacb1dc9 Android: Fix qbs build
Amends ec4fe5f04f and 476b133e91.

Change-Id: I0ecd76bdbd096a6325132011522e417d633de7a5
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-10-13 16:19:27 +00:00
Christian Kandeler
5f1705128a Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: Ic6be03e3d0802a76f3bf2916f37b647526fb2b2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-10-13 13:14:53 +00:00
Orgad Shaneh
5a7a8cbf74 Gerrit: Resolve and store gerrit version
This can be used for enabling features that are available from a specific
version.

Change-Id: I4ce1c8684df2b8e194e8bbb02769ba99fc256408
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-13 13:06:31 +00:00
Orgad Shaneh
5e798b0bf4 Gerrit: Improve error message when Gerrit remote is missing
Task-number: QTCREATORBUG-18980
Change-Id: I99336732d59136f9aec9fc0a97fb3135e9c43f65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-13 13:06:14 +00:00
Tobias Hunger
d717ab4fdf QmlDesigner: Remove unnecessary QLatin1String and QStringLiteral
Mark strings as translateable where appropriate.

Change-Id: If82d234e4eeb4fca1c5153fbce7749c9ead86260
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 13:00:52 +00:00
Tobias Hunger
7c533107d9 QmlDesigner: Remove unnecessary code, add overrides and modernize
Change-Id: Id6751219a2459c1c9673932650c768984f86cb62
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 12:57:13 +00:00
Tobias Hunger
b170996225 QmlDesigner: Remove dead code from puppetcreator
Change-Id: I5e648f1083882be7bad87a7fdbccfd2b3c96a9a9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 12:57:08 +00:00
Tobias Hunger
0fe63ea698 QmlDesigner: Use more nullptr in puppetcreator
Change-Id: Ia723b1629c0d5aff49f54dc026efe0f822f2267a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 12:57:02 +00:00
hjk
f1888a6331 Debugger: Remove no longer needed DebuggerEngine::setNeedsFixup()
Change-Id: I30bc1d6184bd66a634d890999e31dff48d2f25b4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:36:20 +00:00
hjk
cc7754920c Debugger: Simplify use of DebuggerEnginePrivate members
Each engine has now the RunTool pointer, not just the master.

Change-Id: I6bab026998d5da5da82224bfaf4a93d3cfb3a898
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:35:43 +00:00
hjk
ad4ec4eb3c Debugger: Remove DebuggerEngine::m_lastGoodState
The only use left was a not-so-important debug message.

Change-Id: I91bd1b744fb2f173037777461dd15e7720421ccc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:34:42 +00:00
hjk
abe755cfd8 Debugger: Simplify queue/do pairs
The functionality has been needed for asynchronous processing
which are in RunWorkers nowadays, where the functionality is
provided by the general RunControl framework.

Change-Id: Id18f693935cd6faf5b25883dfeaace0dd691f6a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:33:06 +00:00
hjk
d3c1dfe45a Debugger: Consolidate CdbEngine::startEngine()
Change-Id: I92c74b96c891bb46b7ceb9c45ffea268a223b325
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-13 12:32:20 +00:00
hjk
1a1c9bf828 Debugger: Use shared TerminalRunner also for CDB
Change-Id: I2dd9b16f5699d0551a2de3e8ebefc865b98ad862
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-13 12:31:31 +00:00
Christian Stenger
96da2973c3 AutoTest: Clear cached information before running
We cache the last processed model index as well as the used
font. In some cases the cached information interfered with
new information and ended up in an ugly painting issue
where old information partially got repainted instead of
using the new. Clear cached information when starting a new
run to avoid this.

Change-Id: Ibb01e5e3bdd7b542325b5867d37c677d31a14aae
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-13 12:08:18 +00:00
Christian Stenger
72c167be8b TextEditor: Do not create proposals for functions without arguments
Change-Id: I5e53bf34a117c8ad877b91868af8817b1d0c8805
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-13 12:08:08 +00:00
Leena Miettinen
5ce499ce65 Doc: Update docs after Ant support was removed
Gradle is now used for building APKs.

Change-Id: I9ccecac39b70ada5ef1b63a7311ad9187ba0d6b9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-10-13 10:43:16 +00:00
Ulf Hermann
b1a8743f6c Android: Set scheme on QML server URL
The QML connection manager won't accept URLs without scheme anymore.

Task-number: QTCREATORBUG-19046
Change-Id: Ic31787b806ab965f57a4585ee55681a488a88c56
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 10:15:52 +00:00
Kai Koehne
814f699214 Improve Updater dialog
Set a proper parent, and mention in the title that this is about
Qt.

Change-Id: I9f4542267b070c23a7efbe428700a13e8adc9de8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-13 10:02:39 +00:00
Eike Ziller
89ac5b5603 Version bump to 4.5-rc1
Change-Id: I5d7d3ec295feb60ad0d944b4f68344c1857146ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-13 10:01:40 +00:00
Eike Ziller
a83755157b Merge remote-tracking branch 'origin/4.5'
Change-Id: I0a4a1b6787afc817acf2b7a1c3fd2b881c35f57a
2017-10-13 11:59:49 +02:00
Viktor Kireev
02b5426b8e Beautifier: Fix text selection for the Uncrustify
Extension of the selection of the text to full lines
does not work correctly if the selection is performed
from the top to the bottom.

Change-Id: I13a1bf9d6e92ebbbfd4f8190fb626dd3aca74686
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-13 07:47:52 +00:00
Eike Ziller
7643b2ccdc File System pane: Add item for opening project file as project
The default "open" action was changed (in
3c988e5a0d) to open project files in the
editor, so add an explicit action for opening them as a project.

Change-Id: I34ac1e25e249bafeea6659b0f40130d43454bbef
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-13 07:02:24 +00:00
Orgad Shaneh
5d5d0497e5 Git: Use C locale when parsing the command output
Task-number: QTCREATORBUG-19017
Change-Id: Ib77d66e22d227d43245d352905f9b095f7d0f42b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-12 18:52:58 +00:00
Vikas Pachdha
fa43c0d2b9 Android: Fix a possible race condition in SDK manager
QFutureWatcher connections are made after calling  setFuture. This
can lead to race condition

Task-number: QTCREATORBUG-19082
Change-Id: I87379c2b14c722cf4d4a9a374bd1ac1e72b52d5c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-12 10:23:45 +00:00
Vikas Pachdha
5754b7d09f Android: Fix Sdk manager system environment
Android native tools fail if JAVA_HOME environment variable is
not defined

Task-number: QTCREATORBUG-19072
Change-Id: I3db910b34d9bdd9ebc9ba052b5300ecf5ef3ce15
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-12 07:59:52 +00:00
Eike Ziller
1c1dd45bfe Merge remote-tracking branch 'origin/4.5'
Change-Id: Iebd340258966aff910fb9ab0e45b5149e8f242f0
2017-10-12 09:49:14 +02:00
Eike Ziller
cd575e3a76 Do not arbitrarily create directories
The JsonSchemaManager force-created a "json" directory, even in the
installation resource path. This is unnecessary and ugly, because it
creates that even within the Qt Creator installation from e.g. the
online installer, which results in directories being left over when
uninstalling it.

Change-Id: I5c683353b124c219c5f065209212a84a4c7ccd0f
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-12 06:51:34 +00:00
Christian Kandeler
01f81fa4dc QbsProjectManager: Get rid of redundant code
Change-Id: I44c5058161312c832bf1e74c417007d02f2f4f7b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-11 14:07:24 +00:00
Christian Kandeler
f93a55ac5c QbsProjectManager: Fix build setting getting lost
If the user set some qbs property and also unchecked the "Use default
installation" box, the latter setting got lost on re-loading the build
step configuration.

Task-number: QTCREATORBUG-18895
Change-Id: I868312fbbd8e5ca9ad9f34b88866fe7b72884a9a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-11 14:06:14 +00:00
Vikas Pachdha
35689db652 Andriod: Check Android SDK pending licenses
Pending licenses are checked before installing any package and
the user is provided with an option to agree to license terms and
conditions

Task-number: QTCREATORBUG-19000
Change-Id: I4e149b4a6ac84c1f336bb7c50b0d62a2019c7868
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-10-11 12:02:46 +00:00
Vikas Pachdha
5002372533 Android: Auto installation of missing necessary SDK packages
Task-number: QTCREATORBUG-18978
Change-Id: Iac3e2c956ac3da717c6509f28b8d810827947ea0
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 12:01:48 +00:00