Commit Graph

45338 Commits

Author SHA1 Message Date
Jochen Becher
bcc1786fa2 ModelEditor: Add missing namespace for class declaration
Change-Id: I4a10f540042e2730c75559dfd185682d998fe714
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-09 20:40:54 +00:00
hjk
f09f39f7e2 FancyMainWindow: Move toolbarDockWidget "property" to subclass
This was only used to accommodate the debugger main window
and is not needed in the base class.

Change-Id: Ifbe9937cd4c21f5bed2fab35b23d874f4f2dd0e4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-09 15:35:12 +00:00
Robert Loehning
888e2cdfa9 Squish: Update opening of CMake projects
Change-Id: I0131d43c1d7b6d835fb2e1e6c5b5a9d27825a849
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-09 14:56:57 +00:00
Christian Stenger
86c2a44c21 Debugger: Use fixed size for perspective combo box...
...to avoid adjusting the width again and again while debugging.

Change-Id: I67f68b2d54d9f3f9a32cbf1049b4f9e9bd63e010
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-09 13:44:42 +00:00
Robert Loehning
f651960ed6 Squish: Update objects for debugging
Change-Id: I814de42ec153548fdbedad27a06f20515ad49700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-09 13:21:50 +00:00
Eike Ziller
21c25bd1ae Fix disambiguated display name on case insensitive file systems
blah/Foo/bar.cpp and blubb/foo/bar.cpp should not be shown as
Foo/bar.cpp and foo/bar.cpp

Change-Id: I900606c63996eea4c11d09ff13579b6cc031a8c6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-09 13:00:01 +00:00
Alessandro Portale
6ea9201f7b LocatorWidget: Fix hover effect
..by setting Qt::WA_Hover

Change-Id: If4b6e8d443a70e18796dd78b261495f2400db0f4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-09 12:40:59 +00:00
Tobias Hunger
ccf69b3495 CMake: Fix generator kit information widget
Display was resetting to Ninja generator.

Change-Id: Iee39b40da85a5df1140d5880d674e104eed85ca3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-09 12:11:54 +00:00
hjk
f294d3e6be Debugger: Remove one indirection in Debugger::registerAction
... and the now unused action id -> action description hash.

Change-Id: I36ad3658b52fcf32b628620b5cc2bd98bc2ac849
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-09 11:43:38 +00:00
Eike Ziller
9aee611520 OutputPanes: Fix various issues with restoring state
- maximize tool button was synced between modes,
  but the size didn't match that
- size was restored to the last visible size, even if that was
  maximized, but maximize state didn't match that

Manage the state (maximize state & non-maximized size) in the output
pane placeholders themselves. The output pane manager is only
responsible for the non maximized size setting that is restored at
restart.

Task-number: QTCREATORBUG-10992
Change-Id: I35b946bbffeef9fbf5301e34018dd0867bd902a6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-09 11:18:59 +00:00
hjk
ea29a83095 Debugger: Do not switch to undefined perspectives
This implies switching to Debug mode and is currently triggered
by the GammrayIntegration. Avoid it as long as GammaRay has
a mode of its own.

Change-Id: I6174554610038cb66fb1bc977dc537b47941a1d8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-09 10:17:56 +00:00
Francois Ferrand
27deb9c876 C++: fix digraph parsing for <:: exception.
According to section 2.5 from the standard:
""" If the input stream has been parsed into preprocessing tokens up to
a given character: ... Otherwise, if the next three characters are <::
and the subsequent character is neither : nor >, the < is treated as a
preprocessor token by itself and not as the first character of the
alternative token <:. """

Change-Id: Ib9cdac61e3c2243d1bc1d4471a09ae6bd839fdda
Task-number: QTCREATORBUG-13253
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-08 17:24:33 +00:00
Francois Ferrand
dc7b6ca6c3 C++: fix lexing POUND_POUND token with digraphs.
Change-Id: I9204b827c60b283cc4e6b88c810b31eb7587c7db
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-08 17:24:28 +00:00
Francois Ferrand
41b232962a C++: fix trigraph parsing in macros.
Trigraphs must only be parsed before/during preprocessing. The preprocessor
will now replace trigraphs with their standard form, and re-lexing in
TranslationUnit will not try to parse any trigraph.

Also added a few missing trigraphs: ??=, ??', ??! and ??-.

Task-number: QTCREATORBUG-13253
Change-Id: I1723ed53b00090b878c22b83b7e963b647b65f72
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-08 17:24:22 +00:00
Orgad Shaneh
9057143228 BinEditor: Fix crash on editor initialization
MemoryAgent::doCreateBinEditor calls openEditorWithContents, with empty
contents.

The BinEditor fails to handle this case, and crashes when it divides by
zero.

Task-number: QTCREATORBUG-15835
Change-Id: I8009ef991a445ef4cc192d1bda6a208d51e2b48b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-08 15:22:05 +00:00
Christian Kandeler
83e3d954f9 QbsProjectManager: Make project structure available faster.
So that users can navigate the project already while rule execution is
going on.

Change-Id: I88a6f0cf80bf208c418671e3b862e1defe8d86ab
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-08 14:05:00 +00:00
hjk
a8b396b484 Valgrind: Fix filter initialization
Change-Id: Ib136a3abd2f0432001016e17f856cf042a8d2dd6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-08 12:55:35 +00:00
Eike Ziller
80191645a7 EditorManager: Open files with correct case
On case-insensitive file systems we still want files to open with the
correct case, because otherwise Qt Creator will later save it with a
different case.

Task-number: QTCREATORBUG-6510
Change-Id: I8e3f011939306d53c92e28fbf6eded1a2d42a9f2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-08 11:55:05 +00:00
Eike Ziller
68aeb40ff5 Merge remote-tracking branch 'origin/3.6' into 4.0
Change-Id: I5c524b61aa558b66e74a9260b59583851530ac36
2016-03-08 12:51:55 +01:00
Eike Ziller
41e490f503 OutputPanePlaceHolder: Fix for lazily created mode widgets
When switching to a mode that creates an output pane placeholder lazily,
the currentModeChanged signal comes too late to make this placeholder
current.

Task-number: QTCREATORBUG-10447
Change-Id: Icb996e4f51ef5eadff8874ef0c3154b133d98aba
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-08 11:50:36 +00:00
Tobias Hunger
d502727b2c Android: Fix possible crash
Change-Id: I1b73a077f6d2f157d4367358f9f156d32b3e6cea
Task-number: QTCREATORBUG-15832
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
v3.6.1
2016-03-08 11:30:19 +00:00
Nikolai Kosjar
c47e52c97b Utils: Hide tooltip if application becomes inactive
Switching to another application with "Alt+Tab" was working fine here -
the tooltip closed as expected. But switching by clicking on another
application window lead to a left over tooltip.

Tested with openbox 3.6 window manager.

Task-number: QTCREATORBUG-13397
Change-Id: Id92f6df3b63256a962591df2912a0819fc777073
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-08 10:58:00 +00:00
Orgad Shaneh
95d8ed71db Debugger: Re-add language-dependent context
Lost in f3bd7412ef.

Change-Id: I6091db212eff8a4ac15c67e99d9e88fab5b11647
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-08 09:58:00 +00:00
Orgad Shaneh
4c3a144830 Debugger: Add a missing space in language listing
Change-Id: I78a57c5edba1d7cfd59b8b4a93b41fb4ab3ae936
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-08 09:51:47 +00:00
Eike Ziller
f941eed4c8 Add changes file for 3.6.1
Change-Id: If31dcec2a68ed29b565150f136fc1b2554a34235
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-08 09:11:02 +00:00
Ulf Hermann
e236633e28 Doc: Replace outdated QML Profiler statistics screenshot
Change-Id: I1db72ebcd006639ae0aab40c1e168cb644cce650
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-08 08:35:50 +00:00
Ulf Hermann
82879ec7cf Doc: Add section about QmlProfiler flame graph view
Change-Id: I89831fe4052b10518abf0f49d4a1335c09657e22
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-08 08:35:45 +00:00
Ulf Hermann
c84eb2d03e QScxmlcGenerator: Adapt to new command line arguments
Change-Id: I7a8d786002ff8f07fff183fbd01bbaa8a367a20d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2016-03-07 16:55:07 +00:00
hjk
92e301a054 Debugger: Merge debug mode and analyze mode
On the user-visible side, only the 'Analyze' mode button disappears,
and instead a combobox to switch between different tools in appears
in the Debug mode toolbar.

Internally, that's quite some re-organzition: The centralized
'Analyze mode is busy' flag is gone, allowing us to run e.g.
ClangStaticAnalyzer and MemCheck in parallel.

Analyzer tools and debugger now share the same mechanism to
generate/load/save dock widgets.

Analyzer tools now create and handle their own start/stop button
when appropriate. In general, Analyzer tools can create/handle more
than one run control at a time.

Further consolidation is possible, e.g. RunControl state handling
could be merged into the base ProjectExplorer::RunControl to
avoid the still existing duplication in ~15 instances.

Change-Id: I91e5940ebc4211f98056d507cf2f7b5f8efe7f07
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-07 15:06:10 +00:00
hjk
c326011feb Valgrind: Shorten and correct start action name
The applications to attach to do not have to be remote at all.
Also, the name should be as short as possible as space in the
status bar is not unlimited.

Change-Id: I1df8e025114cd8ad94daa5219c26e61ce70e5e5d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-07 14:57:27 +00:00
Christian Kandeler
bd29c4ba09 JSON: Compile fix.
Change-Id: I9dbeff5a70a347efaa88b563a35198258d3c5ecd
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-07 14:50:37 +00:00
Ulf Hermann
71cb3bd49b Doc: Add section about perf profiler statistics view
Change-Id: I5d4a640f42f81f7c81b8c3f3b7f8bc06dff62671
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-07 14:34:15 +00:00
Eike Ziller
ac664fec50 Windows/deployqt: Only ship necessary version of EGL/GLES libs
Task-number: QTCREATORBUG-8296
Change-Id: Idf27427715f3234c077466b623d32829577f13c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-07 14:33:54 +00:00
Ulf Hermann
b4430b61e6 Doc: Add section about perf.map files
Change-Id: I44b4cb31326e5b6d048ec5fbac55ef6208c513a9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-03-07 14:32:36 +00:00
Christian Kandeler
a8da8bc45c Update qbs submodule
To HEAD of 1.5 branch.

Change-Id: I04a8f226d3a8a5279b21a9d9231b6bf9d0cf5e2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-07 14:25:17 +00:00
Christian Stenger
cacc5bfb9b AutoTest: Fix basic CMake support...
...at least for C++ based auto tests.

Qt Quick Tests are out of scope for this issue as this
would need too much additional tweaking for several parts
of the plugin.

Task-number: QTCREATORBUG-15813
Change-Id: I440a8b1f8e6deb9e6acf2e82d0831fb002c10390
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-07 14:20:57 +00:00
Leena Miettinen
6ca2bb3c73 Doc: fix typo in example code
s.loLatin1(); > s.toLatin1();

Change-Id: Id9cbf2350da3cec15513d13f0426ec3bea9a9d63
Task-number: QTCREATORBUG-15827
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-07 11:46:37 +00:00
Tobias Hunger
fd83c50599 Delay kit initialization until after the UI is up
This can potentially be expensive, so delay it.

Side effect is that the "History:" label in the Search Result
OutputPane is now correctly rendered:-) That was broken since
the Kit initialization triggered an event loop to be run too
early by running a SynchronousProcess.

Change-Id: I905c33c6facbbe03f22b9860c277ec658af9326e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-07 09:53:18 +00:00
Tobias Hunger
20f0bd9558 CMake: Improve parsing of unix makefile-based projects
Task-number: QTCREATORBUG-15825
Change-Id: Ifc7bd784a8b9b4b13829859f81ca42829aae383e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-07 09:35:22 +00:00
Christian Kandeler
a57e75884e QbsProjectManager: Execute rules when parsing a project.
This makes information about build artifacts available before the actual
build starts (as far as the rule implementations allow that), at the
cost of a higher initial project resolving time.

Task-number: QBS-901
Change-Id: I0a223db85001136d359a53d4edc7239350f01701
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-07 09:16:01 +00:00
Orgad Shaneh
da3f3eecc5 ProjectExplorer: Delete file even if failed to remove
... when user asks to delete from FS.

When a file is included using a wildcard, the project managers fail to
delete it.

Change-Id: I4f2bc6373c5ade8c5e06b580e41519c63f47891d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-07 09:10:58 +00:00
Alessandro Portale
ea01867297 Themes: Add a theme flag for "default" or "flat" ProjectsMode
I'd like a "flat" style to have a "default" projects mode.
This patch introduces a FlatProjectsMode. The painting code of the
widgets in the project mode follow that instead of the
Theme::WidgetStyle.

In the course of it, DoubleTabWidget does not imitate the dummy toolbar
anymore, but calls the style painting code, instead. That makes the
theme color DoubleTabWidget1stEmptyAreaBackgroundColor obsolete, so that
key disappears from the Theme enum and also from the creatorthemes.

Change-Id: Ia1479c761f61753d6738a43bbde368bf0b8814b2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-07 08:47:37 +00:00
Orgad Shaneh
383737d020 Debugger: Update debugger details when executable is replaced
Store last modified time in persistent storage, and if it is changed,
reinitialize the item.

Change-Id: I15e8c843fecd3cebd528f2dadb64645828a2b221
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-07 07:27:14 +00:00
Alessandro Portale
24f34420fd qtcreatoricons.svg: Updated autotest and analyzer icons
Change-Id: Ib121e6680ae45d56374f6c041a839a961093e858
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-04 23:24:03 +00:00
Alessandro Portale
19bb4be20c "Dark Frame" Theme: Tweaks
Adjusting the splitter color and Info Area colors.

Change-Id: Icca320df917cd5df352c19f1be2a204d1250f17b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-04 16:18:51 +00:00
Alessandro Portale
b427d5d516 FindWidget: Improve margins
Make the top and bottom margins for single-row (search-only) mode equal.
And add a space for the double-row (search/replace) mode.

Looks better with default and flat themes.

Change-Id: I795766834b1a40125bd90e5f3c6486cb8518d37f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-04 15:52:59 +00:00
Nikolai Kosjar
2b2ba298f3 CppEditor: Generate doxygen comments for functions with macros
...at least for object-like macros. This handles the common case where a
macro before the function signature annotates the DLL import/export.

Task-number: QTCREATORBUG-15819
Change-Id: I79f22508188019402fb7345222408aaf90106f20
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2016-03-04 14:22:27 +00:00
Christian Stenger
f99f5dcdc6 AutoTest: Fix enabled state of Run buttons of results pane
Run buttons of the results pane might stay disabled after a
parse if no items would be swept.

Change-Id: I3df800ec0b42fa7de2b010a911922427da51df3c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-04 13:46:51 +00:00
Tobias Hunger
bfd84c3437 PathChooser: Remove duplicate code
Change-Id: Idfbe8e8f89dfe739b10c560a90f56fc519f6b474
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-04 13:24:09 +00:00
Christian Kandeler
6274875ab9 QbsProjectManager: Allow to use default qbs settings dir.
By default, we use a dedicated qbs settings dir located in Creator's
settings path, so that different instances of Qt Creator won't
overwrite each other's profiles. Users for whom this is not a concern
can now choose to use the normal qbs settings dir.

Change-Id: I0119228a48cfee430686ab51f69864866f4ba270
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-04 12:20:21 +00:00