Commit Graph

45338 Commits

Author SHA1 Message Date
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
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
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
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
Robert Loehning
063a6fc9ba Increment IDE_YEAR
Change-Id: Ib7008eddf6c638e04711158dcb3543c3d992d7ee
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-02 10:58:08 +00:00
Christian Stenger
5d6f8547a2 ClangCodeModel: Fix license headers
Change-Id: I8a232ef986fe2492083ae767c14ba903a039c257
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-03-02 10:20:27 +00:00
Christian Kandeler
a57f930036 qbs build: Adapt to new implementation of qbs.FileInfo.
We cannot pass in a relative path as the first argument of
FileInfo.relativePath() anymore, which we relied on in some places. The
old implementation assumed that if both arguments were relative paths,
they had an implicit common base directory.

Change-Id: I55ee62e478da761cf085587c57220d5fb1ac990e
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-02 09:46:37 +00:00
Christian Kandeler
eaabc26126 QbsProjectManager: Display qbs version in settings page.
Task-number: QBS-855
Change-Id: I2f9c5536a79a8a5564daeca869c1d7951732658c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-02 09:43:23 +00:00
Orgad Shaneh
c5f60bcc7c Debugger: Fix compilation without tests
* Some functions were inside WITH_TESTS section.
* MSVC requires Perspective::Split to be explicitly exported.

Change-Id: I272cefc5c4f446415b2714595f8b398f8ce010a4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 08:52:30 +00:00
hjk
ee4874e4ee Debugger: Simplify code a little
Change-Id: Ib259058973eff47e730f4354f2feaaccc3029746
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 08:28:06 +00:00
Eike Ziller
8da98c44f1 Merge remote-tracking branch 'origin/master' into 4.0
Change-Id: Iab01658c329f3bf57077595d54be6ed73f11f715
2016-03-02 09:18:06 +01:00
hjk
f3bd7412ef Debugger: Remove return value from AnalyzerManager::createDockWidget()
Change-Id: If6cd2a68f2f99a1977ded0f05a12790194143274
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 08:08:15 +00:00
hjk
6492d16408 Debugger: Split out re-usable parts of ex-AnalyzerMainWindow
Next steps is to re-use it for ex-DebuggerMainWindow.

Change-Id: Ic272d062f6db2e54ed62082c2a7d3a289b810a03
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 08:06:55 +00:00
hjk
397e6546e1 Debugger: Split debugger main window implementation
... into a plain Utils::FancyMainWindow object and the debugger
specific functionality in Debugger::MainWindow.

A step forward to share the Utils::FancyMainWindow with the
(Ex-)Analyzer MainWindow and towards merging Analyzer and
Debugger mode.

Change-Id: I50e89d9d615226cb9b9af1a653c7383468e40a93
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-02 08:05:23 +00:00
Alessandro Portale
c43c0163a5 Add the "Dark frame" Qt Creator theme
http://blog.qt.io/blog/2015/02/09/qt-creator-flat-style-ui-design-new-light-theme/
defines a dark and a light theme. We start by implementing the dark one.

"Dark frame" stands for dark toolbar areas and light content areas.
The name is silly, and we need to find a proper one before the release
(we will most likely keep the silly name, though).

Since the existing "dark" theme is much darker and has a dark content
area, we don't want to simply replace that.

Change-Id: If2197c4a07ae1e374be4449b6ed0383cdbe314b3
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-01 18:28:50 +00:00
Alessandro Portale
7ef8ba082d Application wizard for Qt.labs.control based applications
Let's make it easier to create applications with Qt labs controls. This
creates a tabbed navigation style. We can add options to the wizard to
create drill-down and other common navigation styles. Also an option
for the controls style (material, universal, etc.). And perhaps a
checkbox to include the virtual keyboard.

Change-Id: I9672ab12aa616e7ce08e90eb244fad525e5ab2b2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-01 17:39:46 +00:00
Nikolai Kosjar
83e18c127c Clang: Introduce warning configuration per project
Change-Id: I5b9a330274e6f72b0786259eb25aa454877d4eef
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-03-01 15:55:30 +00:00
Alessandro Portale
b590642a85 FancyLineEdit: Implement flat style
Follow Diana's guide for flat themes:

http://blog.qt.io/blog/2015/02/09/qt-creator-flat-style-ui-design-new-
light-theme/

Change-Id: Ia15f266dbf9138e9cac61e04265970543b2505bf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-01 14:42:19 +00:00
Ulf Hermann
302162e6d6 QbsProject: Use filesGeneratedFrom() to find files for ExtraCompilers
qbs::Project::generatedFiles() without tags retrieves all generated
files recursively. That is not what ExtraCompiler expects.

This way it should do the same as the other project types. It should
only retrieve the first level of generated files. However, as
filesGeneratedFrom() is currently unimplemented in QbsProject, in fact
it doesn't retrieve anything and the feature is disabled for now.

Change-Id: I8ba0b5e9310a55fcd348b3547d8ff87d97a1b498
Task-number: QTCREATORBUG-15796
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-01 14:32:19 +00:00
Tobias Hunger
5aca8ca27e CMake: Remove no longer used code
Change-Id: Icdd132b891e223a874051448bb4e5a090bdc245e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-01 14:30:44 +00:00
Tobias Hunger
a8853fa8b1 CMake: Make shadowBuildDirectory helper available
Make shadowBuildDirectory(...) a static method of CMakeBuildConfiguration.
That way it can be used by a future projectimporter.

Change-Id: I1b3ffc821ac9197aa5c90e2b78891df7a81a31dd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-01 14:29:24 +00:00
Tobias Hunger
68b99dac2b CMake: Make parsing of CMakeCache.txt files available
Change-Id: I94876851dd4cf737418c4c00b589af1b3a9535ed
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-01 14:26:34 +00:00
Orgad Shaneh
d9a57623af Clang: Add some tests for lambda highlighting
Test that local, argument and member variables are highlighted
correctly when referenced inside a lambda

struct LambdaTester
{
    int member = 0;
    void func() {
        const int var = 42, var2 = 84;
        auto lambda = [var, this](int input) {
            return var + input + member; // All variables here
        };
        lambda(var2);
    }
};

Change-Id: I3b7b86c57a91f0f254715770dd870033be928b28
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-03-01 13:20:49 +00:00
Alessandro Portale
c2dfd0f53b Update Canvas3D application wizard to Qt 5.7 level
Upgraded r74 three.js port, which is compatible with Qt 5.6 and Qt 5.7.

Some three.js features require Canvas3D 1.1 API,
so increased the import version in the template.

Change-Id: I1ae37237073d4149f56c1d93579b20a576496e33
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-01 12:24:51 +00:00
Ulf Hermann
09c4ae8ed5 QmlProfiler: Limit hard resetting of QML debug connection
On windows it can take a long time to establish the connection. On OSX
we want to throw away the first connection after trying for 200ms. We
don't want to introduce #ifdefs here, so after throwing away two
connections stick to the third one.

Change-Id: I407120244747ac39429786e371c93a7d1e29933d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-01 12:04:40 +00:00
Nikolai Kosjar
8cfef9657a Clang: Introduce switching/adding of warning configurations
A warning configuration is a list of command line (warning) options for
libclang. Three non-editable built-in configurations are provided by
default. The user can copy a configuration to customize it.

This is still a global setting and it changes take effect after
re-opening a document. Both issues will be addressed in follow-up
changes.

Change-Id: I86667d7dc39ad31b88666454220e6da563797740
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-03-01 11:21:36 +00:00
BogDan Vatra
4f04900f45 Update qbs submodule.
To HEAD of 1.5 branch. Also do the necessary
adaptations in the QbsProjectManager plugin.

Change-Id: Ic4c756b7f6134b9c61bad9635ac25c1e33c75825
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-03-01 10:52:08 +00:00