Commit Graph

44349 Commits

Author SHA1 Message Date
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
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
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
Vikas Pachdha
c52ee5238b Android: Enable common arguments for SDK manager command
Task-number: QTCREATORBUG-18978
Change-Id: I9f3e2b16a77ff949268960d2b5c5aa1896fa3770
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-10-11 12:01:29 +00:00
Vikas Pachdha
476b133e91 Android: Android SDK manager user interface
Task-number: QTCREATORBUG-18978
Change-Id: I421ea66fcd4f3cf38e6cfd3be58a35b3f9204c6f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-10-11 12:01:02 +00:00
Vikas Pachdha
4b1429de55 Android: Add APIs to install, uninstall and update SDK packages
Task-number: QTCREATORBUG-18978
Change-Id: I3e19d665fb5b8a3a562010484735022d7ed333a1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 12:00:47 +00:00
Vikas Pachdha
e70179e14f Android: Add API to check whether to use native SDK UI tools
Task-number: QTCREATORBUG-18978
Change-Id: I1cf4749e81b3b49de14ff88a5876569886d2cdfe
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 11:59:46 +00:00
Vikas Pachdha
daee6f6f33 Android: Enable Android build, platform and SDK tools parsing
Task-number: QTCREATORBUG-18978
Change-Id: I84d4ead3180ab818493aff9975a7a9b813fba8d0
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 11:59:34 +00:00
Vikas Pachdha
0ca97ab2bd Android: Enable parsing of available Android SDK packages
Task-number: QTCREATORBUG-18978
Change-Id: Icb9ba0a3afc3ca4386f056aa9e3de057dc9cdf7b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 11:59:18 +00:00
Vikas Pachdha
4c4500c605 Android: Make SDK package parsing logic generic
Task-number: QTCREATORBUG-18978
Change-Id: I7e643842d6378a172fcfe5984cec931621ff9c41
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 11:58:35 +00:00
Vikas Pachdha
ec4fe5f04f Android: Refactor Android SDK packages
Introduce a hierarchy for Android SDK packages and refactor the
code accordingly. This is ground work for sdk management and
automatic android setup

Task-number: QTCREATORBUG-18978
Change-Id: Idef545e3b3a8e33e920be52b26094fb8046afcd3
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-11 11:58:16 +00:00
Vikas Pachdha
240d310a81 Android: Re-design android settings
Make Android setup related issues visible to user

Change-Id: Ib543c41edd9031d2bf12ac2e87b84bf4791781b7
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-10-11 11:57:46 +00:00
Eike Ziller
eaa5cfaa98 File System view: Do not open projects on double clicking directory
That functionality is available through the context menu.

Task-number: QTCREATORBUG-19035
Change-Id: If08fe798f06c013ca5149fad7934d38e357b2342
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-11 08:31:11 +00:00
Eike Ziller
1932912e7c Add icons to file system view directory selector
Change-Id: I0b6451d7f68fae93e0b140aaea030c88ec1a8801
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-10-11 07:06:41 +00:00
Orgad Shaneh
679cee878d VCS: Clean up QLatin1String in VcsBasePlugin
Change-Id: I80e01ee352c5a973b5b84537df7b4170b6e1f036
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-11 06:30:25 +00:00
Vikas Pachdha
409e708720 Fix abi not found for Qt version
Task-number: QTCREATORBUG-19066
Change-Id: I618347d81396a779de3f7b02da6f5f363a22ae88
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-11 02:34:52 +00:00
Alessandro Portale
1748195e50 Utils: Add an icon for "Project"
Whether it is should be the wrench or the screw-nut is currently
unclear. Let's make it a wrench for now.

Change-Id: I8688e808dab0f522d7fee59885ae443ea0b67db1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-10 18:07:28 +00:00
Vikas Pachdha
c3688b901f Ios: Fix incorrect Xcode version detected
pkgutil always return the Xcode path installed via app store

Task-number: QTCREATORBUG-18091
Change-Id: I47b5a9c3f3a482feea2dc903dbff3441a3930ab6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-10-10 17:33:38 +00:00
Jake Petroules
845271e957 Android: turn "use Ministro" into a checkbox
Ministro is an advanced deployment option which requires knowledge of
how to set up and maintain a Ministro repository. Place it with the
other advanced options instead of as a checkbox alongside the normal
deployent mechanism which is used by default and probably in the vast
majority of cases, in order to reduce cognitive load on the user and
clean up the UI a bit (since two options in a radio selection doesn't
make much sense).

Task-number: QTBUG-62995
Change-Id: If33b3c73db4fcc66717dd4ff0f7923f0250e8418
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-10-10 14:41:12 +00:00
Christian Stenger
9bd0fcbe2e Revert "Clang: Improve locking of string cache"
This reverts commit be939a80db.
'shared_timed_mutex' is not available before Xcode 9.

Change-Id: I1ac6c2b3691d5b4f457c431e255629a526c48c3a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-10 09:12:21 +00:00
David Schulz
4a3765d64c TextEditor: Use visual whitespace format for line wrap arrow
Change-Id: Ifbf31010171ea4fd762457337ed56f60c19d5b4c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-10 09:09:16 +00:00
Alessandro Portale
9a7e1cd6c6 VcsBase: Modernize the icons
Use themable, HighDPI enabled icons for commit and diff.
Re-use an existing red cross for the removesubmitfield.

Change-Id: I43f46db96d07de9a7e166937d470d48e45d7f3fb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-09 13:20:20 +00:00
Christian Stenger
faee18d31e AutoTest: Enable debugging for Quick Tests
Task-number: QTCREATORBUG-18961
Change-Id: I6f00c84ea6279ceb59745e5bb12349511ae4637b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-09 12:46:33 +00:00
David Schulz
c2686fd9ae TextEditor: Fix annotation rectangle caching
The rectangle of an annotation is cached after it was painted. If just a
part of an editor was updated all annotations were removed but only
redrawn annotations were added to the cache again.

This behavior is replaced by removing annotations that are not visible
and those which got redrawn. So annotations that are still visible but
were not redrawn are kept in the cache.

Change-Id: I9246f1347b8f795284fb4fc9aabe11f251d16c25
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-09 12:31:33 +00:00
David Schulz
26d0b536ca TextEditor: cleanup annotation rect cache after mark is removed
Change-Id: I8a0ab2df9d310da6025325ab3114eeadabfd4fb1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-09 12:31:24 +00:00
David Schulz
5fb310828e TextEditor: reduce annotation painting artifacts
Request an update covering the complete annotation
rectangle if it is not part of the event rectangle
and Correctly calculate the position for the gradients.

Task-number: QTCREATORBUG-18855
Change-Id: I68b61459e6fd94949baebba25f965226f9d5e441
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-09 12:10:44 +00:00
David Schulz
cf624f92bd TextEditor: Optimize line annotation painting
Paint an annotation only if the event rectangle
contains the block for that specific annotation

Change-Id: I5f992f916da25268dd2c9e6b4703701934c8551d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-09 12:10:20 +00:00
Eike Ziller
07bec99e8f Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
2017-10-09 12:09:27 +02:00
Alessandro Portale
86ff493b99 ProjectExplorer: Reduce the size of the device status indicator a bit
Less In-Your-Face.

Change-Id: I4beb93e1db5f9fd7776fd07e49d7dc6f210468c1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-10-09 08:58:23 +00:00
David Schulz
efb67d277e CMake: fix qbs build
Change-Id: I91295b054b1603aa8daca297c6a29c0ac7f134d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-09 05:50:18 +00:00
Andre Hartmann
b1701ae933 TODO: Remove Latin1String
Change-Id: I2765abdafe508ad2d025f6c9b7b3374a6f1c79b5
Reviewed-by: hjk <hjk@qt.io>
2017-10-06 14:22:15 +00:00
Christian Stenger
508913e6b9 AutoTest: Fix compile with clang
Change-Id: I7657e0e823ae4c826efc987e2f414a51af3f1305
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-06 12:14:57 +00:00
Christian Kandeler
676d69b524 Fix qbs build
Change-Id: Icb2a8bcf4c6f60f02cdbe1cb509e871ce70165f6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-10-06 11:24:50 +00:00
Orgad Shaneh
3d5b077d86 QtSupport: Filter . and .. in paths lookup
Change-Id: Ibb5718fedeaf1dcc45d51dd5da42bf0043cbb485
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-06 10:58:47 +00:00