Commit Graph

45161 Commits

Author SHA1 Message Date
Tobias Hunger
07d9b769aa CMake: Only reparse cmake build directory for active buildconfigurations
This fixes the several progress bars from popping up when creating a
cmake project via wizards.

Change-Id: I1d61e74db8a190afd6302cd56f141e08e521a587
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-17 12:10:07 +00:00
Tobias Hunger
2db184db60 CMake: Make sure processes are dead before cleaning temporary directory
This should stop messages about processes still running when cleaning
up the directory on windows.

This also makes sure the progress bars are closed again.

Change-Id: Ic3e94efc8bdecca35437987e0647284cb48af121
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-17 12:09:57 +00:00
Alessandro Portale
22a0bdcdbe ProgressBar: Always show a minimal progress
... In order to avoid an empty progress bar background which can be
confusing especially with flat themes.

Change-Id: I062267f7a3f2627e0d043821a2dbd7462b6ce11f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-17 12:06:57 +00:00
Alessandro Portale
bc481dc399 Flat theme: Same disabled color all side/tool/status bar icons
And adapting darkframe.creatortheme accordingly to match Diana's
specification

Change-Id: I9e1f62869ff91d7cfd3a26f51d26225d549a0965
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-17 11:54:14 +00:00
Christian Stenger
1584328da9 AutoTest: Add some theming support for results pane
Change-Id: I6641dc92d54ea20263656fa77157d7d853cf0287
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-17 10:21:26 +00:00
David Schulz
d9561d365f WinRT: Correctly initialize unusable QML debug server address.
Task-number: QTCREATORBUG-15873
Change-Id: Icf7bb6efcaf674d81d462f6ed92878c87db29307
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2016-03-17 10:21:12 +00:00
Christian Stenger
507a7e89eb AutoTest: Fix enabling run buttons
If a parsing for tests is in progress the buttons might get enabled
but they should be disabled until the parsing has finished.

Change-Id: I3f089626983c219a9b54d8fc057a7ff51f11dc8c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-17 10:00:12 +00:00
Ulf Hermann
7e03cbd8a0 Timeline: Allow setting the timeline model's displayName
This makes a lot of things easier. There is no real reason for it to be
const.

Change-Id: I426a2cbcfce6eae7cf7fabc28ab63098885324b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-17 09:25:24 +00:00
Alessandro Portale
5ab8440e2f ProgressBar: Add a theme color for the background
The progress bar is important and custom enough to deserve its own theme
color for the background. This change adds "ProgressBarBackgroundColor"
and also sets it for dark.cretatortheme, so that it has a good contrast
to ProgressBarColorNormal.

Change-Id: I37731d7a918a862a28940e215c913f9ade8569ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-17 08:05:08 +00:00
Petr Vanek
cdbf1f5ab3 Refactor FolderNavigationWidget to use core functionality
Change-Id: Ia9ee772b8538370d3cb9378ddaf6e30f32dfaebc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-17 07:44:17 +00:00
Orgad Shaneh
a5a4f02ced Core: Make IDocument concrete
Change-Id: I8290943614ea4a2060cf09a71fb4f957852ab705
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-17 07:43:55 +00:00
Tobias Hunger
5e623ddfd1 CMake: Improve handling of cmake configuration in kits
Use macros. This makes it possible to address the current qt version
and toolchain without having to update those values all the time.

This significantly simplifies changing Qt versions and toolchains in
the kit as well as the code itself.

Change-Id: I35128eebdc96fe6175f565b2e9bdaa40862516a7
Task-number: QTCREATORBUG-15830
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-16 15:37:48 +00:00
Tobias Hunger
ca805445fb ToolChain: Add Compiler:Executable to CurrentKit macro expander
Change-Id: I4452accb3d3fbb3f42467ed0869705bffd3c56dd
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-16 15:37:41 +00:00
Tobias Hunger
0864179073 Qt: Add qmakeExecutable to CurrentKit macro
Change-Id: I6fd0bf19207279dc071faa023fa9fb3b53a6ea17
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-16 15:37:36 +00:00
Alessandro Portale
49525a11f4 Flat themes: enable recoloring of the status bar & progress
The flat OutputPaneToggleButton now has the same hover and selected
colors as the sidebar items and toolbar items. This changes the
appearance in the dark theme a bit, and I hope in a good way.

Change-Id: I52826c6d1c4539f799c74580f195a95609ea0416
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-16 14:49:13 +00:00
Eike Ziller
3446e00361 TextEditor: Fix tab indentation if single line is selected
If single line was indented with tab, and the insertion point was at the
beginning of the line, the selection moved away from the beginning of
the line. Pressing tab a second time then deletes the line, because the
line is no longer completely selected.

This behavior was also not consistent to the case where the insertion
point is not at the beginning of the line.
The patch makes sure that the selection stays at the beginning of the
line.

Task-number: QTCREATORBUG-8421
Change-Id: I9847c2fe41e2e4f993f5e486c071acc112adb45d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-16 14:32:40 +00:00
hjk
35a16cc394 Debugger: Make some of the plugin tests compilable again
Change-Id: I5c3885cb385dc1c15dce14f2ff52bf70edee8399
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-16 14:04:05 +00:00
Eike Ziller
6cecb7e4db Merge remote-tracking branch 'origin/3.6' into 4.0
Change-Id: Id86f31f52ed1d3f28745b2324b8af32283a24ded
2016-03-16 14:11:53 +01:00
Christian Stenger
40e902c744 CPaster: Fix handling of pastebin.com
Task-number: QTCREATORBUG-15856
Change-Id: I7084b3537522bb8c5322644bc30c5fe5503f58b2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-16 11:31:47 +00:00
Alessandro Portale
b07e5eaf65 ProgressBar: Make it really flat for flat themes
Change-Id: I3964492e4b07dcba594d5bebc1b74d9458578e88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-16 11:29:23 +00:00
Tobias Hunger
c70af100ec CMake: Remove usused member variable
Change-Id: I338a41cc9a4f3e91ed0613f047a2da7ca0ed6cb4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-16 10:29:51 +00:00
Alexander Drozdov
a618eb2a9f Don't use quoting for additional tool arguments...
...that passed to the build tool (cmake --build...)
and specified by user.

Change-Id: I0de51161b5dd700f3160f048fa6f02743a5186e6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-16 09:38:47 +00:00
Christian Stenger
2123ce49a2 Debugger: Make manual tests compilable on OSX
Change-Id: I1a17677bf5636addcbb291097613006d0324070c
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-16 09:20:52 +00:00
hjk
13ea128102 Debugger: Adjust error message for Qml Debugger Console
Displaying live contents uses nowadays a feature of Qt 5.7. The previous
display was not using the correct context. For Qt < 5.7, access is now
only possible when the context is clear (e.g. because a breakpoint
was hit). This patch adjusts the error message in the other case.

Task-number: QTCREATORBUG-15831
Change-Id: Ic25a3f6bca05523b16063f3e7daed6817c0002e7
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-16 09:10:42 +00:00
hjk
41a24ade75 Debugger: Make manual tests compilable without Qt Script.
Change-Id: I9464ce8dfc22e107c8f97a139092f0a9a338bbf2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-16 09:10:29 +00:00
Ulf Hermann
07f80f6de8 Parse "aarch64" as 64bit "arm" ABI
"aarch64" seems to be the most common name for the 64bit ARM
architecture and we should autodetect it.

Change-Id: I7deccde15fa22d37965b2f28e4a6e998da7f81ae
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-15 16:06:27 +00:00
Tobias Hunger
12889af047 Move C++ mime types from cppeditor to cpptools
Have the mimetypes and their registration in the same plugin
as their constants.

Change-Id: I350ab4eb0da3941ca9282ff98d8d0e158b568ef3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 16:00:18 +00:00
Tobias Hunger
2c60cb2e42 CppEditor: Remove acronym and extended-acronym from mimetypes.xml
We do not have that anywhere else, so it is probalbly not necessary.

Change-Id: Ia2db7874a0cc597598633b4810cf9bd9a8c85b2d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 16:00:08 +00:00
Eike Ziller
f8a1e34393 Fix registration of Qt documentation
Restoring project explorer related information was delayed, including
tool chains, which triggers restoring Qt versions. Qt documentation was
registered in QtSupport's delayedInitialize which comes before
ProjectExplorer's delayedInitialize, so no Qt versions were found to
register documentation for.

Register documentation in QtVersionManager::triggerQtVersionRestore
instead.

Change-Id: Ia36f4d89672f2c651157dee50c3e8996af55598c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-15 15:37:54 +00:00
Tobias Hunger
95a6e2427c ToolChainManager: Use nullptr
Change-Id: I361cc20646b85f8aadc0281d5f7cf7f59c39257a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-03-15 14:54:25 +00:00
Tobias Hunger
09cdd1c4a5 CppEditor: Register qdoc as a separate mimetype from c++ sources
Add a new constant for qdoc mimetype to cpptoolsconstants.
Make the CppEditor handle qdoc mimetype.

This change has one user user visible effect:
Adding qdoc files to a qmake project will no longer put those files
into SOURCES where qmake will then try to compile them. They will show
up in "Other Files" instead.

Task-number: QTCREATORBUG-15872
Change-Id: Ibbf9af0a84fab59138f6b9ab41f1bba737b455c2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 14:35:08 +00:00
Tobias Hunger
1287b72728 ToolChains: Allow to update kit with exactly one toolchain available
This was broken. Thanks to Philias on IRC for reporting this.

Change-Id: Icc91b8c307bf54e5e90cf017dfb9d7ae4fc31529
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-15 14:23:33 +00:00
Tobias Hunger
750aeb919c Remove duplicate mime type constants from CppEditor
Use those in its dependency CppTools instead.

Change-Id: I376782863784a878e84ce2cd5d0c6da68b05ab61
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 13:54:50 +00:00
Tobias Hunger
285f28b426 CppEditor: Fix indention in mimetype file
Change-Id: I0540104284a12a0a5c55dd472a1bf8a03a2d8463
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 13:50:16 +00:00
Tobias Hunger
d6041ed26a CppEditor: Remove duplicate line from mimetype definition
Change-Id: I54d0345e2a0d98303824056db7b24ceafa6cd55f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 13:50:11 +00:00
hjk
958b3178df Debugger: Move last separator in toolbar next to the views menu
Looks more natural there.

Change-Id: Id1c717869fbc903e55e4e4a2bc27dfe7db843423
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-15 13:36:03 +00:00
Christian Stenger
9f4124df5b Debugger: Fix copy to clipboard...
...for Locals & Expressions.

Task-number: QTCREATORBUG-15870
Change-Id: I5768908ab731adffd695627206fd03cc5ccce957
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-15 13:13:09 +00:00
hjk
af8d9b1dc7 Debugger: Adapt to Android(?) GDB 7.10's changed register format
The previous 'v4_int32' tag now shows as 'u32'. Look for either.

Change-Id: Ie47fd564ec5ee1f08f44f3fb43180f5cdc495884
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-03-15 12:06:47 +00:00
hjk
3c874a0d0c Debugger: Re-enable initial population of register view
Registers are only retrieved if the view is visible.
When it becomes first visible, an extra poke to initiate
population is needed.

Change-Id: I67c3e166ce98e6405707f8457ebd32d0d1939229
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-15 12:06:17 +00:00
Orgad Shaneh
e5459fb9dc QmlJS: Limit MIME type matching to extension
This improves performance of MIME type resolving on project loading.

When the MIME type cannot be resolved uniquely by extension to >50 weight,
the file preamble is read in order to match against magic values in the
MIME database.

In 3953e2b447862576902abef11ffb4efc56d7a625 the weight of the standard
file extensions was increased to 70, to at least avoid expensive matching
when the answer is obvious.

Qml types only have glob patterns anyway, so this shouldn't break
anything.

Change-Id: If3add50809a4361f877ea261fba6d6f333b2b740
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 11:57:38 +00:00
Orgad Shaneh
ba517fcfab ExtraCompiler: Remove stored targets list
Itereate over the hash keys instead.

Change-Id: Ib14bef708b74ed1938bcb985b3a5091aca704391
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-15 11:52:49 +00:00
hjk
1c483b95a6 Doc: Modernize example code a bit
Use Qt 5 connects.

Change-Id: I0e8ae956258892f60a1d12222a081c0fa6577717
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 11:24:49 +00:00
Eike Ziller
af05e661a3 Change log: Fix indentation
2nd level list must be indented with 4 spaces

Change-Id: I68ab4820c335308cb200c1a195c7ddaeb67bb797
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-15 09:19:50 +00:00
hjk
c09ebb8f13 Debugger: Re-enable retrieval of register content
Less use of magical object names.

Change-Id: I2da17f1cefe1a72f4ea8be4c041e7443265def93
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-15 08:47:21 +00:00
Alessandro Portale
0f066bd3d9 "Dark frame theme": Fix some colors
By copying them from default.creatortheme

Change-Id: Ib833f19988276c73eff9c745eaab59d01b6bcad8
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-14 17:39:32 +00:00
BogDan Vatra
0fda5b6354 Android: Fix GDB location for NDK r11
In NDK r11 gdb was moved to <ndk_dir>/prebuilt/<host>/bin/gdb[.exe]

Change-Id: I8eebb552a92313c5f4f36611b26f54f7c9c6126f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2016-03-14 15:31:39 +00:00
Tobias Hunger
c003cb946e QtC Plugin Wizard: Use #pragma once
No need to discuss individual header guards that way;-)

And that is what we want to use in Qt Creator now anyway.

Change-Id: Idb2d7a34ea3c5d99c18c696eaed4023c12c01930
Task-number: QTCREATORBUG-15861
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-14 15:17:44 +00:00
Christian Stenger
5a7b517a1a CPaster: Fix failing slot connections...
...and resulting failing fetch attempts.

Task-number: QTCREATORBUG-15856
Change-Id: I94a0308a638021b13046b52b0c1f783202d27af0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 14:21:35 +00:00
hjk
0196de330b Debugger: Avoid proxy action loop
Use the real start action data to Initialize the toolbar start proxy
action with the real action, not the menu action.

Change-Id: I498ba0069e9f259f90122eb6378c79f08e4d24d1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 13:29:08 +00:00
Tobias Hunger
54febaef31 CMake: Use pragma once
Change-Id: I946c819196c5f0f00a13d2f98bae3dff66a43428
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-14 13:23:50 +00:00