Commit Graph

45338 Commits

Author SHA1 Message Date
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
Tobias Hunger
578c107a16 CMake: Do not try to parse progress information lines
The lines with "[x%] Building something" do not contain errors,
so there is no need to parse them (causing false positives to show
up).

Change-Id: Iee87deb73db9e82040cab5401b74c70be91e6191
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-14 13:23:46 +00:00
Tobias Hunger
38a051b6a4 CMake: Avoid needless cmake runs after kit changes
Do not run cmake if the kit has changed in ways that
do not effect cmake. Do clean rebuilds for changes to the generator
or cmake tool, etc. which do not work without that.

Change-Id: I4e9d43c5161246c3ded7f784cb0d44c3bd4b04e9
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-14 13:23:41 +00:00
Tobias Hunger
99a884051f CMake: Export internal cmake cache values
Those are useful for the cmake internal classes, but need to be filtered
out when they are going to get displayed to the users.

Change-Id: I0bb62fa840fa8cb9e6f3b47300ba85a2b186bad0
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-03-14 13:23:38 +00:00
Tobias Hunger
de9eeb233f CMake: Improve method names
I just mixed those methods up, so I'd better improve their names:-)

Change-Id: I38a37df4adb0d0402e2c3d9304c79aa414609976
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-14 13:23:35 +00:00
Eike Ziller
e60cffd2e4 packageIfw: Fix warnings
Change-Id: I3c8df19e1fb50e5d41413751f502cb5f7331bfc4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 13:18:43 +00:00
Eike Ziller
db61acce80 Installer: Support different display version than component version
The component version must be numeric, but we want to display e.g.
Qt Creator 4.0.0-beta1 in the installer title.
The change adds a -d parameter to the script and adds corresponding
replacement variables.
Display version falls back to component version.

Change-Id: Ia8bcd05444e280f8a44ab321b043f4031725600d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 13:18:22 +00:00
hjk
c3772bfd4c ProxyAction: Break endless loop
Updating the ProxyAction first disconnects from the action and then
connects again. Looks like reconnecting while being in
QMetaObject::activate can lead to never ending handling of the
activation, so use a QueuedConnection instead.

Change-Id: Ia06f926413fd4492d847dfea4461f2ccfdd37ffc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 13:15:39 +00:00
Francois Ferrand
3d82a67484 Autotests: emit testTreeModelChanged when new tests are added.
The signal used to be emitted only on reset or when tests are actually removed during sweep phase:
thus the 'run tests' button in test panel stayed disabled if the panel was opened while tests were
scanned.

Change-Id: I274c9d03f1e1140c8aa375f92465c5a0c866cd62
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-14 12:39:36 +00:00
Alessandro Portale
04a68518c9 Themes: Make theming of the menu bar optional
Inspired by numerous user feedback, I want to turn off the theming of
the menu bar for the new flat theme, and make it look like in the
default theme. At the same time, I want to leave the "dark" theme as it
currently is.

This patch adds a theme flag FlatMenuBar and turns it off for the new
theme.

Change-Id: I9bba056a27fab7a634b45324e3fe8cd26f50df74
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-14 11:00:44 +00:00
Ulf Hermann
b6c1e58f58 ExtraCompiler: Parent extra compilers to plugins
Previously the extra compilers were never destructed. As any plugin that
registers an extra compiler factory has to depend on ProjectExplorer, it
will delete its factory before ProjectExplorer is unloaded. So, removing
the extra compiler from the list on destroyed() is safe.

Change-Id: I22fbe662a5704c0294512b8774acb85745c1cbe5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-14 10:55:34 +00:00
Ulf Hermann
ee729091fd Timeline: Scroll the main view when its width changes
This updates the scrollbar and the zoom slider to the new realities.

Change-Id: Iedcbf839332b4e5cb2d59917b0f822feb11b0d44
Task-number: QTCREATORBUG-15843
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-14 10:07:16 +00:00
Christian Kandeler
0bb8d52269 QbsProjectManager: Rework parsing/rule execution logic again.
It does not seem to be safe to update CPP data etc and then continue
with rule execution. So now we do it like this: We execute rules if and
only if no target artifact data is present, and updates are only done
afterwards.

Change-Id: I580918a8ec434b2c59bd044506c3a8e961c6b674
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-14 09:48:34 +00:00
Orgad Shaneh
12574a4c74 Core: Fix memory leak
Detected by memcheck

Change-Id: Ic6e1ae6735ebea252858682e1a269f86166a9aa4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 09:46:47 +00:00
Orgad Shaneh
32f95a3493 QmlProfilerExtension: Initialize all members in FlameGraph
Use C++11 member initialization.

Change-Id: I6b2ed5c82854eadd15f97d7753cc6e0cc727ee5c
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-03-14 09:44:28 +00:00
Orgad Shaneh
b427ac706b Core: Initialize all members in FindToolbar
Use C++11 member initialization.

Change-Id: Ib4db2fc9354658a0a4969c18f2857678cb49bdae
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 09:43:27 +00:00
Francois Ferrand
3044d0f7cb Autotests: show failed test count in panel badge.
Change-Id: I4e747530460ebe07c6589c7562a32cd35c60b8bf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-14 09:36:38 +00:00
Orgad Shaneh
41059acc18 Changelog: Add some entries
Change-Id: Icb61b6748e597568416dd6419b93e0829afc1ecb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 09:36:37 +00:00
Orgad Shaneh
62570e1640 CMake: Fix crash when changing build directory several times in a row
Change-Id: I349e72a321f1a0cdcbce4f948c363336815ef3f3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-14 09:33:26 +00:00
Orgad Shaneh
a7d89e6bc8 QtSupport: De-noise generators
Change-Id: Ic6148e9de36b67cb3142ab0ccca4b8cdd920cf95
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 08:51:05 +00:00
Christian Stenger
f34bb5e81c AutoTest: Avoid using costly containers
Replace several occurrences of QMap with QHash as we often do
not care about the order and use iterators instead of fetching
keys or values to iterate over them.

Change-Id: I5061a7e7e60fe259ac2aa31915f338a373e278d3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-14 08:46:28 +00:00
Orgad Shaneh
58654c134e GenericHighlighter: Update from latest KTextEditor source
Change-Id: I84b783df1eaca9e162e50f23e1da8fa0afa9666d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-14 08:34:33 +00:00
Orgad Shaneh
5da9055706 GenericHighlighter: Support new default styles
Introduced in KTextEditor commit f80e12bedca0d8f682aebc450d1b6d66550010ce
(version 4.100, 2014 Mar).

Change-Id: Ib3614077b3bf5f4254266ec79d0abdbb486fd685
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-14 08:34:27 +00:00
Orgad Shaneh
3eecd80064 GenericHighlighter: Annotate styles for formats
And reorder the IDs insertions by the enum order.

Change-Id: Idad8e8635772eacbb54b15d78dcd9ab93618fbba
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-14 08:33:39 +00:00