Commit Graph

50929 Commits

Author SHA1 Message Date
Leena Miettinen
b1a7731c46 Doc: Describe the qsTranslate() option (Qt Quick Designer)
Change-Id: I7033f683f86157830addf1b403baab0379f631c7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:05 +00:00
hjk
1336826460 Debugger: Make "Add Expression Evaluator" available in QmlJS editor
Task-number: QTCREATORBUG-17754
Change-Id: I249e904634edbfd30bd11a4402470c3d5586478c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 11:20:09 +00:00
Robert Loehning
062678a937 Squish: Add some debug logging to openDocument()
Change-Id: If34eaad1bd04a7d2409f0e00c217c7bd12add106
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 10:49:37 +00:00
Ulf Hermann
9f0a51a0d1 QmlProfiler: Change total time and recursion display in statistics
The total time taken for a program should be the sum of durations of
events on the bottom of the stack. This is also what the flame graph
model does, and it results in useful percentages for total and self
times.

Recursion still has to be accounted for when showing the total time of
a specific event type, but we mark events with recursive calls and
show the time and percentage of recursion in the tooltip. As we already
showed binding loops on bindings and signal handlers before, this
integrates nicely.

Change-Id: Id4654e314bf86ce8bd06ceaaf93a67187c629adc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-21 10:43:53 +00:00
Ulf Hermann
548a86f577 QmlProfiler: Add text marks for QML/JS types into documents
The text marks are little labels next to the lines in the editor
that tell you how much of total run time was spent in the
respective QML/JS construct during the last profiling session.
This is similar to what the valgrind profiler does.

We add the text marks only when the documents are loaded into an
editor. This keeps the number of text marks manageable. Multiple
events on a single line are shown using a tooltip.

Task-number: QTCREATORBUG-17757
Change-Id: Ie38b8ab880a718a1ef72ef343d84070ab34bc5bc
Reviewed-by: hjk <hjk@qt.io>
2017-02-21 10:43:47 +00:00
Montel Laurent
8d7feb4bc7 Delete dialogbox => avoid memory leak
Change-Id: I0f6eba4366f7760bfafd201e6ac22b23b11ce61c
Reviewed-by: hjk <hjk@qt.io>
2017-02-21 10:19:55 +00:00
Nikolai Kosjar
dce4f03fc3 CppEditor: Rearrange toolbar widgets
Move the parse context switcher and the additional preprocessor dialog
button to the left. Thus, the new order is:

        ...
        minimized info bar buttons (not always there)
        additional preprocessor directives button ('#')
        parse context switcher (not always there)
        outline widget
        ...

This is better for splits and makes logically also more sense since the
outline widget depends on the additional preprocessor directives and/or
the parse context.

Change-Id: I3378885a44938072e6a496ce1573d1675499c498
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-21 09:54:28 +00:00
hjk
7f73f3950e BaseTreeView: Make resizeColumns() publicly accessible
Simplifies the only used code path through the model and a custom
signal.

Change-Id: I9bbab725cdd122b7261a8f14b101786e38e61e57
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 09:16:51 +00:00
Montel Laurent
aa8c4aad16 Add spacer between widget and dialogbox button
So layout is ok when we resize this dialogbox

Change-Id: I1b6bec39547808795ae9e516f6a4aaa20d892b35
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-21 08:58:49 +00:00
Marco Bubke
a5e96dbd99 Clang: Work around missing file
We now generate an empty fake file.

Change-Id: I92fef2b24dce788c1d1b675b034d4b31346b80d9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-21 08:25:47 +00:00
hjk
d74afaa0ed Debugger: Fix Locals windows column width adjustment
Task-number: QTCREATORBUG-17756
Change-Id: I44f97386ab5018b60832f76f5856425bc55096d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 07:50:25 +00:00
hjk
c99e48868a BareMetal: Make some functions const
Change-Id: I8159888933bc0e87c100fdd20cb90b45f1e35888
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 07:34:42 +00:00
hjk
373a29d580 Debugger: Simplify LocalsAndExpressionsWindow implementation
No need to keep some members

Change-Id: I24640654a4e1c9b529ee3847b48ee875b1083a12
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 07:34:34 +00:00
Marco Bubke
30cb3be524 Clang: Fix warning
Change-Id: If1706b7a68de0b4b407bf4aebc17640c29c3990a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-20 17:28:15 +00:00
Marco Bubke
40d54fb509 Clang: Enable LLVM tooling again for windows
Change-Id: I5df7bcce03ce122c536fcd052b2567d4318d34f9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-20 17:28:10 +00:00
Friedemann Kleint
4deee5431a gcc2tasks.pl: Also detect errors
Previously, the script would only detect warnings. Adapt
the pattern to capture errors as well.

Change-Id: I15ad97a9a1305aab91c046518f3c46b2e0c55127
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-20 16:21:43 +00:00
Marco Bubke
537217288a Clang: Ignore CHeader
Because we don't now if a *.h file is a C or C++ header we provide both
as project file if a C and C++ file is present. But C++ is not readable
by C compiler. So we skip that files and hope there is no non referenced
C header, which is very very unlikely.

Change-Id: I5505713e759749c8a0738e11b70bb6b309412966
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-20 16:09:16 +00:00
Marco Bubke
58763aa996 Clang: Silence warnings
Change-Id: I63f8a85f0a352fc8f41835bd3ab1574255d4436b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-20 16:09:05 +00:00
Marco Bubke
a66f3e8cc0 Clang: Cancel query progress bar
Change-Id: I1b8a4ec052a548e5ed09f39c3f0d3c87b13a6bd4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-20 16:08:56 +00:00
Marco Bubke
b52f559718 Clang: Remove unused code
Change-Id: If04ec8854dd61e88c14f52d4c4fb23734407c27e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-20 16:08:53 +00:00
Robert Loehning
6600328979 QmlProfiler: Initialize QmlProfilerDetailsRewriter::detailsRewriter
Change-Id: I4891885ff30c88bdca32af062e161758501db6c1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-20 15:04:37 +00:00
Christian Stenger
8349242770 Squish: Adapt to changes of project wizards
Some project wizards have nowadays build system support.

Change-Id: I2d7e9ffd5be2ec74a012fa977281e032596229b5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-20 14:56:38 +00:00
Nikolai Kosjar
8a74595bb2 ProjectExplorer: Avoid calling network compilers
...because it potentially leads to long running processes, depending on
current the icecc/network state.

Change-Id: Ic4390d7c5aa1bf7c78e85a6777843379b2cdd24c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-20 14:24:49 +00:00
Eike Ziller
dbb2288f1a Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/shared/qbs

Change-Id: I05c4945d238b7724ca73477fc3b21554564951c0
2017-02-20 15:20:14 +01:00
Nikolai Kosjar
6ba90cd06a QbsProjectManager: Set proper Qt version for C++ Code Model
Change-Id: I04b5524e971e5617a9bae88c1fcab087d62d7a73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-20 13:54:36 +00:00
Eike Ziller
00b22e40fe QMake build step: Add missing error messages
Print error messages whenever initialization of the QMake build
step fails.

Change-Id: Id39795219ec74591a78b8db4d0a381e072261f51
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-20 12:56:47 +00:00
Alessandro Portale
ba3f47e24a ProjectExplorer: Remove right margin in ProjectWelcomePage
Make use of the right space. Also, this moves the scrollbars
to the border, which looks more conventional (and which was the case in
welcomescreen1).

Change-Id: Icad9dedf80832012227d5ee6fb05083180bddf5d
Reviewed-by: hjk <hjk@qt.io>
2017-02-20 12:17:23 +00:00
Alessandro Portale
cefe7d86c8 QtSupport: Use ScrollPerPixel in GettingStartedWelcomePage
Change-Id: Iffab231cbf6570cd74fbc57a2d1e96c44f8acd6b
Reviewed-by: hjk <hjk@qt.io>
2017-02-20 10:39:04 +00:00
hjk
ebc1d3693c BareMetal: Add a few 'final' to re-implementations
Change-Id: Id34c29d5aa95198c987a6ca02ccfd6645c112f84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-20 10:09:38 +00:00
Nikolai Kosjar
8c90998fff CppTools/ProjectManagers: Reduce ui blocking when loading projects
${AnyProject}::updateCppCodeModel() did two potentially not that cheap
operations in the ui thread:
 (1) Querying the MimeDatabase for the mime type for the source files of
     the project. In 99.9% of the cases no files need to be read for
     this as the file extension will resolve the type. The expensiveness
     comes from the sheer number of files that can occur.
 (2) Calling compilers with the "(sub)project's compiler command line"
     to determine the macros. While the caches avoid redundant calls,
     the number of the unique compiler calls makes this still a
     ui-freezing experience.

These two operations are moved into a worker thread. For this, the
expensive compiler calls are encapsulated in thread safe lambdas
("runners") in order to keep the "mutexed" data minimal. The original
API calls of the toolchains are implemented in terms of the runners.

While adapting the project managers, remove also the calls to
setProjectLanguage(). These are redundant because all of the project
managers already set a proper value in the constructor. Also, currently
there is no need (client) to report back detection of C sources in
project parts. This also keeps CppProjectUpdater simple.

There is still room for improvement:
 * Run the compiler calls in parallel instead of sequence.
 * Ensure that the mime type for a file is determined exactly once.

Change-Id: I2efc4e132ee88e3c8f264012ec8fafe3d86c404f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-20 09:18:13 +00:00
Alessandro Portale
010060de5c QtSupport: Remove right and bottom margin in GettingStartedWelcomePage
Make use of the right and bottom space. Also, this moves the scrollbars
to the border, which looks more conventional (and which was the case in
welcomescreen1).

Change-Id: Ib3553c588f0c24bbff8afeead1a3e69d4d77a00f
Reviewed-by: hjk <hjk@qt.io>
2017-02-20 08:46:02 +00:00
Robert Loehning
6c8b1e268a FakeVim: Don't try to read from file which could not be opened
Change-Id: I3468d1a4c9e3ba7bcfd6526f5541b3ec4e84a3e4
Reviewed-by: hjk <hjk@qt.io>
2017-02-17 17:49:19 +00:00
Alessandro Portale
2d9dc5a27f Welcome: Readjust link buttons to Diana's metrics
The hover area is 30px high and the spacing 5px

Change-Id: I252f87b1961768d54a65ddf69c8106e87790b2a3
Reviewed-by: hjk <hjk@qt.io>
2017-02-17 17:34:38 +00:00
Robert Loehning
5ac44bcf64 FakeVim: Remove dead code
Change-Id: I2e331e1e7ae23f7457cd4e19107fceff85e118e6
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@qt.io>
2017-02-17 16:59:47 +00:00
Nikolai Kosjar
5d0636fadd Clang: Fix setting cursor position after dot-arrow-correction
Change-Id: I2685de00056197505c512f63f44b54b4bca81c15
Task-number: QTCREATORBUG-17697
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-17 15:27:08 +00:00
Christian Kandeler
7ee75bf4c2 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: I81eb7e5d2bfd70382d4f3f672f07a403eacaada7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-02-17 12:53:45 +00:00
Tobias Hunger
2513116406 qmake: Fix WS
Change-Id: Ied361023444e21575504d2175c36fefd02e43752
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-17 12:51:38 +00:00
Tobias Hunger
2c4a27d4d4 ProjectNodes: Add setter for addFileFilters to VirtualFolderNodes
Change-Id: I8a52798546b75f001c5ee447eee6024b06b0d287
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-17 12:51:30 +00:00
Nikolai Kosjar
77dbee7bdb Tests: Fix compilation of tst_dumpers.cpp
Change-Id: Icdd65a6fc510e4bdb6071ebd4314a0eff7559f4f
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 12:46:50 +00:00
David Schulz
df9377ecb6 Debugger: Fix setting display format based on type
Change-Id: I5d2b1016d0ad24237abc24233b580049d1c6add0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-17 11:47:23 +00:00
David Schulz
4e16c507c1 Debugger: Restrict tests with initializer lists to MSVC 14+
Change-Id: I685909652bd7567473a2e6d09254d67e8bb51b33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-17 11:47:13 +00:00
Christian Stenger
e6987b821a TextEditor: Fix missing include
Change-Id: Id93ec7fce863a2307bee7ff53e442b09dac87da6
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 08:59:11 +00:00
Orgad Shaneh
2a297593d6 GenericHighlighter: Handle invalid keyword list references
makefile.xml has bmake_var_modifiers_noarg and
bmake_var_modifiers_with_arg which are not defined.

Change-Id: Ice5bcaf86e7dbe90d4e9b2c52babbc62f9491e05
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 08:13:02 +00:00
Christian Stenger
23398229e9 AutoTest: Modernize code
* remove unnecessary QLatin1String where possible
* foreach
* nullptr
* bad naming of static members

Change-Id: If0f7c6839be4d2efbfef6f7f0775d2034775bd90
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 08:01:36 +00:00
Christian Stenger
085ac718d5 AutoTest: Replace obsolete function
Change-Id: I633a554472f0327160fcbdd9be78798c41014a51
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 08:01:28 +00:00
Christian Stenger
ae2c068e68 AutoTest: Fix handling of data tags in test results
Avoid adding test functions again and put further data tags
directly below the respective test function.

Change-Id: I29775b836cc4584358ee67b5f07744986c6a6591
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-17 08:01:15 +00:00
Christian Stenger
e2b909c6b6 Wizard: Adjust Qt Quick UI wizard to latest changes
Change-Id: Ib68de88cec3d049d0a495e8e36d658325e5d323f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-17 05:50:46 +00:00
Marco Bubke
aba09cc115 Clang: Add test for include collector
To be secure that include is only called it the definition is true.

Change-Id: I04bae9860e64206a1c6886d7cf1682a87e9f9a07
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-16 17:39:16 +00:00
Marco Bubke
1a75db12f4 Clang: Improve speed by content generation
The argument parsing has some considerable overhead. We try to avoid that
with merging all content together in one file.

Change-Id: Icf426bb5d6a5569d59c180f94c7eab66a22a251c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-16 17:39:05 +00:00
Thomas Hartmann
3ecee265c6 QmlDesigner: Remove dead code
Change-Id: I11cecafb6132b4c1cbcdcca9d3eedd78ee23c83c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-16 16:22:11 +00:00