Commit Graph

44961 Commits

Author SHA1 Message Date
Marco Bubke
2349b13ae5 Clang: Rename HighlightingInformation to HighlightingMark
Change-Id: I3954c7c9abe593ea04092337f48ac2b153e883ba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-07 12:06:40 +00:00
Eike Ziller
a1a6c5dd13 Merge remote-tracking branch 'origin/4.0'
Change-Id: I23d59ff61741c0f9067e542e53f7830ea60cb10b
2016-03-07 13:03:04 +01:00
Marco Bubke
b0c570a068 TextEditor: Add TextStyles to Sematic Highlighter
We need a way to propagate the text styles to the sematic highlighter.
Optimal would be what we exchange the old way to the new for every call but
a gradual approach is much less intrusive.

Change-Id: Id419c3366770f3067291f5ab762fb2beb6921498
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-07 11:53:53 +00:00
Marco Bubke
7834bf76f2 TextEditor: Add declaration format description
Change-Id: Ibea12f324308a07d7e549d60a1b1c5767659efb3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-07 11:47:21 +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
Thomas Hartmann
1a49ec3ffb Cleanup QmlDumpTool
Remove unused functions and parameters.

Change-Id: Id03e455bc334c93a5e4bcebe98ca5db8be26c826
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-07 09:43:37 +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
Eike Ziller
0c44156328 OpenEditorsWindow: Add all history items with a model entry
Also add an history item for which the document is closed, if there is a
DocumentModel::Entry for it. Makes it easier to share some code between
code paths, and is a preparation for making it possible to suspend
editors also later on (not only on session load).

Change-Id: I9d1e50da989eb7e3fc33cbd27394d68750a9d1e9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-04 13:22:32 +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
Eike Ziller
c165f2f0cc Fix vanishing output pane manage button
Looks like QApplication::globalStrut() can be 0,
but we want the button to expand anyhow.

Change-Id: Ia0f5c6c97bf352d16edd010efee7fda944b7a5ad
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-04 12:11:45 +00:00
Tim Jenssen
f8fc11ea87 QmlDesigner: add missing space
Change-Id: I0ae64f47c47255e2dab4bb8c417bbf2a2a3eee88
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-04 11:01:27 +00:00
Eike Ziller
16c7a262cc DocumentManager: Fix issues with handling of externally modified files
Use ApplicationState and ApplicationStateChange event instead of
deprecated ApplicationActivate event and unreliable
QApplication::activeWindow(). That fixes an issue where the file change
dialog was not shown after closing a modal dialog on Linux, because
there the activeWindow is temporarily set to 0 for some reason.

Also avoid excessive timer. Modifying a file that is open in Qt Creator
should not result in the system waking up 5 times a second afterwards.

Task-number: QTCREATORBUG-15687
Change-Id: I105d08cd590cc3c8ee5d8efdc568ad5fd2be0857
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-04 10:49:15 +00:00
Nikolai Kosjar
5fcdeb7727 CppTools: Apply has_include workaround also for a mingw toolchain
Change-Id: Ib501b40870f71a552b0bd38fa4977b450fd37954
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-03-04 09:53:59 +00:00
Alessandro Portale
ef1106a27f Revert "Gathering feedback about flat mode icons"
Feedback gathered, thank you for the patience.

This reverts commit 9e9bae54c7c456584e26b3ca61cdadd3da25726c.

Change-Id: If5be24e9f97f172d9e6f170d80b2747cf3e9dc04
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-04 08:39:35 +00:00
Eike Ziller
d1a85604af mapReduce test: Fix compilation with GCC 5
Change-Id: I509c5474ab06e80deb70a2e4c43f648265fa00b8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-04 08:27:38 +00:00
hjk
2f470e26de Modeling: Compile fix for Qt without SVG
Change-Id: Ia3ce41df63850e253643922fe5537375a4b57c3d
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-04 07:21:30 +00:00
Eike Ziller
ec3505a663 Merge "Merge remote-tracking branch 'origin/3.6' into 4.0" into 4.0 2016-03-03 15:22:16 +00:00
Eike Ziller
727b918773 Help: Fix issues with scrolling to right position
The different viewer backends have different issues with scrolling to
the right position if the URL contains an anchor. In all combinations of
"viewer was visible/invisible when help was requested" and "viewer last
showed the same/a different page then the requested URL".

Move the special logic from help plugin to the viewer backends.

Task-number: QTCREATORBUG-15548
Change-Id: I962c90695ceaee48800a3590676e1d28343cf790
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-03 15:10:57 +00:00
Eike Ziller
f4e87a7e0c Merge remote-tracking branch 'origin/3.6' into 4.0
Conflicts:
	src/plugins/projectexplorer/applicationlauncher.cpp
	src/plugins/projectexplorer/applicationlauncher.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qtsupport/uicodemodelsupport.cpp
	src/plugins/qtsupport/uicodemodelsupport.h

Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57
2016-03-03 16:10:04 +01:00
Marco Bubke
36e0025d6e TextEditor: Fix mixin font settings
We don't clear the cache so that changes in the font settings are not
reflected in the editor.

Change-Id: I9d54992d0770b42e1055e99d9e8a2866dd698672
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-03 14:53:18 +00:00
Alessandro Portale
9bde122764 default.creatortheme: add dummy FancyToolBarSeparatorColor
Change-Id: I1d7a27bf7fb749e9b13f17584e1b57db0ea0acbd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-03 14:50:38 +00:00
Eike Ziller
770bd08803 mapReduce: Perfect forwarding.
Support move-only types for the container, container's item type, the
state type, and all the involved functions.

Change-Id: I5c46e42cc41e46187f7bb4ee4043f8b3b5d31320
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-03 14:10:21 +00:00
Christian Kandeler
0aeb654685 TODO plugin: Fix initialization of scanning scope.
The code was using an uninitialized value as the default when loading
the settings.

Change-Id: I4a46e79feb4c6726f8bff1e8f03b75c9de646cd6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-03 14:03:09 +00:00
hjk
65d7aedd27 Debugger: Rename Perspective::Split to Perspective::Operation
We have 'raise' in there now, that's not a split anymore.

Change-Id: Id45c606056dfab1317fad37b2fe37216b0eacf85
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-03 12:53:45 +00:00
Alessandro Portale
b0c8a68aba Flat Theme: Final touches for tool bar separators
To properly support Diana's design, we need a dedicated theme color for
the separator. Also, the vertical separators have a certain margin.

Change-Id: I4d009342a9320848ec97f5c2d324bfb672650101
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-03 12:19:53 +00:00
hjk
f25bd123eb FakeVim: Simplify FakeVimSettings object
Change-Id: Ic4f4d23af021ed779a500183ca4b145dd3bc3443
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-03 10:14:17 +00:00
Tobias Hunger
fc57682120 UicCodeModel: Make process killing more robust
One possible cause for the crash reported in QTCREATORBUG-15672 is
that uic is in the process of getting killed while somebody else
already starts a new instance.

So this patch makes that more robust by using a new QProcess instance
for each uic run.

Task-number: QTCREATORBUG-15672
Change-Id: Ibf4feda4fd783fbcadbdbbed30edeb0ff3c85871
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-03 10:06:08 +00:00
hjk
55dcec95f7 QmlProfiler: Shuffle tool widget creation around
Put the border between plugin code and view code in a more
natural place.

Change-Id: Ib5250a30e52ec9899dcb01bac23cdad62a2d5c5e
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-03-03 09:57:31 +00:00
Tobias Hunger
3cffacdd0f CMake: Improve default generator setup on Windows
If ninja is not an option on windows: Pick mingw makefile generator
for kits with a Mingw toolchain on windows and the nmake makefile
generator for other toolchains on windows.

On Unix fall back to the Unix makefiles generator if ninja is
unavailable as we did before.

Change-Id: I8005615e6f725d38c16c1b9026d3f7548e7b42db
Task-number: QTCREATORBUG-15756
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-03 09:53:08 +00:00
Alessandro Portale
0f8e3f2000 Flat themes: Implement Diana's separators
The flat theme as defined by Diana has the motto:
"Remove unnecessary lines, avoid gradients".

This patch implemets that for the flat themes, while
leaving the default theme unchanged.

The only tweak that touches all styles is that
"Styled Separator" has for consitency now the same look
as standard toolbar separators.

Change-Id: I80ab0d9bf5ca20ab0daa57baf5a7e095a4a0c653
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-02 17:32:42 +00:00
Eike Ziller
1698b77827 Fix translations of JSON based wizards.
Used inconsistent translation contexts.

Task-number: QTCREATORBUG-8945
Change-Id: I59d1370501438f4ca00cd801cb6f2803a5ada9b7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-02 14:47:07 +00:00
Eike Ziller
a6d43e317b Translations: Fix some wrong contexts in ts files.
We often have includes relative to e.g. <qtcreator>/src/plugins, so we
need to pass these to lupdate as well to make it find headers there.

Task-number: QTCREATORBUG-8945
Change-Id: I1d44c90b9a5f6da742666fe3dcd0fc83b1c527f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-02 14:13:05 +00:00
Robert Loehning
02de3071ee Squish: Update tst_git_first_commit
Change-Id: Ib5122595a3036345f441238de20878885f860aa4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 13:56:10 +00:00
hjk
9ff81d5c68 Debugger: Make Perspective status label global
After some discussion we agreed that the contents is ephemeral
and does not need to survive perspective switching.

Change-Id: I41de6a8f9478e4bd229c8b204ef7a3fa0a344b75
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 13:14:14 +00:00
hjk
7a5226aa47 Valgrind: Clean up tools interface a bit
Mainly move tool specific code from plugin.cpp to *tool.cpp.
Clean up includes etc.

Change-Id: Ic968ead9d93099c59abe9f99a9db529305160f95
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 13:14:07 +00:00
Ulf Hermann
c0b9565de7 QbsProject: updateCppCodeModel() after building for extra compilers
We don't know the target files of extra compiler until we build the
project. So, if we detect that situation when generating the code model,
regenerate it after building the project the next time.

Change-Id: I5dab9be2fcc14a11b01ecbc0d67f2d8e895c1b91
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-03-02 12:37:30 +00:00
Ulf Hermann
77b1063d8c QbsProject: Implement filesGeneratedFrom()
Unfortunately we cannot use it for updating the code model after all,
as the same file might be used in different products to generate
different files. However, with the new "recursive" parameter to
qbs::Project::generatedFiles() we can use that function directly there.

Change-Id: Iec8e1a1366c6f4d94198b38bcb464d05106dbbff
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-03-02 12:37:26 +00:00
Christian Kandeler
8e1ec99a07 Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: Ic39054f3f1379e75f57a559efd206bacd2b82f62
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-03-02 11:16:01 +00:00
Orgad Shaneh
2383a6b452 QbsPM: Do not delay initial parsing
When a project is opened, delayParsing() is called several times:
* activeTargetChanged -> buildConfigurationChanged
* environmentChanged
* startupProjectChanged -> ... -> buildDirectoryChanged

delayParsing starts a 1s timer for aggregating all the relevant changes
before starting the actual parse.

This makes sense also when the user makes changes (like switching build
configurations fast, or editing the build directory).

When the project is opened initially, there's no reason to wait before
parsing.

Change-Id: I4eb0c7d3419465bc01e8f9febc9ee808684adb6e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-02 11:06:06 +00:00