Commit Graph

54723 Commits

Author SHA1 Message Date
Eike Ziller
cff2cc90e2 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
2018-01-09 13:13:00 +01:00
Orgad Shaneh
a8ddaafca4 Git: Introduce Recover Deleted Files action
Change-Id: I913c07522a8ca82366fd142597430c02e53faa27
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 11:33:21 +00:00
Sergey Belyashov
32786ea9ca Fix typo in Russian translation
Task-number: QTCREATORBUG-19555
Change-Id: I4bc595e1d724ff6231f4dc5d6fcc266c8c3468ea
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
2018-01-09 10:17:32 +00:00
Robert Loehning
b1239d6c4c Squish: Remove outdated workaround
This reverts commit dbfbe1d65d.

Task-number: QTCREATORBUG-19523
Change-Id: I443c1bbed42f9aa96593b66a6b135bd6df35447d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-09 10:12:17 +00:00
Mitch Curtis
62a3d16950 Add tooltip to distinguish between identically named dependencies
Task-number: QTCREATORBUG-16781
Change-Id: Ia11845a8509d1f02a59c4abdef7089678d6b277a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-09 09:10:43 +00:00
Ulf Hermann
1e0ea7f42e ProjectExplorer: Remove target/BC listeners from ExtraCompiler
When target or build configuration change, the target files that
ExtraCompiler checks to see if a rebuild is necessary will be outdated.
The project managers recognize that and reinitialize the ExtraCompilers
in that case. Thus, we don't need to listen for those changes in
ExtraCompiler.

This has the added benefit of reducing the number of transparent
rebuilds triggered by ExtraCompiler.

Change-Id: If8b55f0f5343b221c039d4bd4a8f0c3ab412cc94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-09 07:51:38 +00:00
Ulf Hermann
874ec43abe Timeline: Don't use JS arguments in signal handlers
... and the parameter has a name after all.

Change-Id: I762474dfde29e8445fe69cf7361702a1a447e1bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-09 07:49:50 +00:00
Orgad Shaneh
68969b0b2a ProjectExplorer: Fix build with tests enabled
Broke by 5ec29538.

Change-Id: I5fe15aba818b7e6fe64d5c13225109700e43b166
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-09 07:39:31 +00:00
hjk
4e19b3609e ProjectExplorer: Remove *Configuration::availableCreationIdsChanged
Unused and apparently unneeded.

Change-Id: I58fab4e426b7daeac5a68887b5eacfeeb17013d3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 16:48:55 +00:00
Tobias Hunger
5ec295383d UserFileAccessor: Add tests
Change-Id: I310fdd542f0629a2353229be3e479a9f916fec19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 15:46:44 +00:00
Nikolai Kosjar
5f8ac59ef8 Clang: Fix tests without any ASSERTs
Change-Id: I3148cb85271ab021832caa5bd09dedb6aeeef49f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 15:21:23 +00:00
Ulf Hermann
747818291d QmlProfiler: Test that attachToWaitingApplication tries to connect
Change-Id: Ic71cb60b70e9b68e455795511594a6be5739eb5f
Task-number: QTCREATORBUG-19496
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 15:14:27 +00:00
Nikolai Kosjar
b08f15a36b GLSL: Auto run qlalr generator when explicitly requested
...because we support building Qt Creator with multiple Qt versions
(different qlalr versions), thus the generated source files might/will
differ.

Done-By: Christian Kandeler
Change-Id: Ib38d2a73704a030627b716f6f5b4a1e5c6a8ad14
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-08 14:53:10 +00:00
Ulf Hermann
da1453a13d QmlProfiler: Allow QmlProfilerRunner::stop() without profilerState
This can happen because a run control may already initiateStop when in
Starting state.

Change-Id: Ie872cb1ba5d0ff65eb1c82ff90f9659311e534f4
Reviewed-by: hjk <hjk@qt.io>
2018-01-08 14:50:49 +00:00
Christian Stenger
38d5c585af AutoTest: Fix wizard for gtest on Windows
Change-Id: Iab9711df2455fc2efb678bfd85e8a95b2de7587c
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-08 14:20:02 +00:00
hjk
1ec9d76e2b ProjectExplorer: Promote RemoteLinuxRunConfigFactory::availableBuildTargets
This was already almost the desired final pattern, so make it the default
implementation of ProjectRunConfigurationFactory::availableBuildTargets.

For the only remaining feature of "decorating" the build target names,
introduce a property m_displayNamePattern.

Un-adapted sub-classes still need (and are able) to overide.

Change-Id: Ia7d2d2f7d53f8b1da487fa82c8265ad5deb47500
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 14:07:45 +00:00
David Schulz
30d733a2e1 Editor: initialize block count after duplicate
Task-number: QTCREATORBUG-19550
Change-Id: I0f93823ca919a269b07412103715a0fe0a8adeb8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 13:57:43 +00:00
Orgad Shaneh
e744e6677c Project: Fix bad comparison in isKnownFile
Broke by 43f57d3f31.

Task-number: QTCREATORBUG-19523
Change-Id: Id154f680b85d0238cf096fb0d56c779309c9f598
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-08 13:43:26 +00:00
Robert Loehning
8e6fa26c83 Fix warning about supposed out-of-bounds access
Change-Id: I996dafc272076fe62209ebee5c44f7d9caf19302
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 13:43:01 +00:00
Nikolai Kosjar
e3b1259004 Clang: Introduce DocumentParsed as job requirement
This is in prepration for a follow-up change, which introduces a state
where the Document is not yet parsed (it was reset) but the queue has
jobs.

All jobs get this requirement except those that generate an AST.

Change-Id: Ifcbb704e54108b40797180514c5ad3f3768ef10b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 13:18:54 +00:00
Nikolai Kosjar
063b327097 Clang: Clean up clangjobqueue-test.cpp
Change-Id: If10deb858bbf0ec725c029d5e914c5109de7b5ee
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 13:18:47 +00:00
Nikolai Kosjar
1d936177a0 Clang: Fix typo
Change-Id: Ib6da2189f79c9f2306db6dd1f8292e3944f7ecd2
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 13:18:43 +00:00
Marco Benelli
d11e31230c QmlJs: remove bundles for QtQuick1 type descriptions
QtCreator now assumes that QtQuick2 is used, so the relevant bundle is
loaded unconditionally.

Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-08 13:15:23 +00:00
Orgad Shaneh
fdf95a2fe7 Wizards: Fix project file name in root directory
If the common directory is root (such as "/", "D:/" etc.), the first
character of the project file name was chopped.

Change-Id: Ic2b81fd2f95e4d2a0bdb5e93ade243c3e1029893
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 13:13:17 +00:00
Christian Stenger
8c6c9fa2a8 Utils: Remove directory icon
This icon had been moved already, but its declaration
and definition were still present.

Change-Id: I7e0f5cc91f83ac19e9bba9838b1fbc4d7258c6c7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-08 12:50:27 +00:00
Ulf Hermann
85b8ae4b8c Utils: Extend FileInProjectFinder to also find directories
Change-Id: I7b9f0252e25b2cde9cdadb0a939e2a367c4b47be
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-08 10:20:55 +00:00
Ulf Hermann
8964de84d3 Remove qmlsceneCommand() and qmlViewerCommand() from BaseQtVersion
qmlviewer is QtQuick1 and not supported anymore.

The qmlscene command is in general not a property of the Qt version but
of the target device, as we generally assume Qt binaries to be
preinstalled on the target and qmlscene is executed on the target.

DesktopQtVersion retains a method to retrieve the qmlscene path as there
target == host and having the method available enables us to warn if the
binary is missing.

Also, QmlProjectManager needs to pick the qmlscene command from the Qt
version if it's a desktop Qt.

Change-Id: I2ee0f993e60b96d672080db2db0a6abe5ca933e3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-08 09:13:56 +00:00
Ulf Hermann
8880b32426 QmlProfiler: Show more useful arguments in attach dialog
Without "CanvasFrameRate" the QML profiler won't be very useful.

Change-Id: I8bff2b600db31bd1092c1a5f79e27e4177c97086
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 09:11:01 +00:00
Alessandro Portale
17e6c0ab97 QmlDesigner: Don't blur the form editor items and background pattern
When zooming in, or generally in dpi scaled mode, it is not desirable to
have blurred items or blurred edges on the background pattern. Design
tools don't do that.

If an item is painted smaller than its natural size or if it is rotated,
it should be painted with interpolation.

Change-Id: Ie221db47a8f9a807c99ba8e0c96a2cc8d5115d6f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-08 08:33:19 +00:00
Orgad Shaneh
53b2df46e0 Gerrit: Set current repository every time the dialog is shown
Task-number: QTCREATORBUG-19562
Change-Id: I17918e08f7d3092ffe54ab359bf2b41c51813367
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 08:13:53 +00:00
Orgad Shaneh
1decef8fc9 Gerrit: Deduplicate detection of current repository
Change-Id: Ib3a63f71dd45c45b20eab51a2a0bf9c21ba8754a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 08:13:48 +00:00
Eike Ziller
ca8b727e42 Attach progress details to the toggle progress details button
The popup is corresponding to the button (and the summary progress bar),
and that automatically also moves it away from the right border a bit.

Task-number: QTCREATORBUG-19308
Change-Id: Ie6f72f19552285586395776b175ca142f56c7d6e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-08 08:11:35 +00:00
Robert Loehning
e4b07d6f74 Android: Fix typo
Change-Id: I5f732957d893ab94cd7486658019407137069891
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-01-05 17:53:29 +00:00
hjk
2d108079bd QmakeProjectManager: Remove unused QMakeStep::forced() accessor
The m_forced state is completely handled in the step's implementation,
nobody accesses it.

Change-Id: I05e15a53b08462e9c82d3f498e26aea0303a4ecf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-05 16:52:53 +00:00
Robert Loehning
517b35c9d7 Android: Initialize members
Change-Id: Iba2ec7c99d4083edf92601a8a7f2e5074f30cd7b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-01-05 16:48:34 +00:00
Nikolai Kosjar
a44d7b9ced GLSL: Run qlalr generator on demand with qbs
Done-with: Christian Kandeler
Change-Id: I67cbed82afa238d31cb7070e35ec980ae9b9b32f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-05 16:01:17 +00:00
hjk
1a8f5312a1 iOS: Remove unneeded declaration and include
Change-Id: Ice187c2b20f4ae6e61d56e9d0ba07608f66219e4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-01-05 15:42:54 +00:00
hjk
cd78648bd6 AndroidQmake: Remove some unnneded qmake specific qualification
Change-Id: I00ef10a5b2479355fb7f44e1a3159841bc68dfa7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-01-05 15:40:36 +00:00
Nikolai Kosjar
5972e27169 Clang: Ensure to clear all affected translation units on project part change
The ones that were already dirty were not taken into the account and
used the old project configuration.

Change-Id: I949d1ca8c23bbdb18eec78e5a708199beff6f735
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-05 15:27:44 +00:00
Nikolai Kosjar
8ced936e79 Clang: Enable QTC_ASSERT() output
We had all debug output disabled by default, even the one generated from
QTC_ASSERT and friends.

Change-Id: Ie41eac49c2c3da25f584e43d7c9a292715b3f355
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-05 15:27:07 +00:00
Nikolai Kosjar
31f61592e4 Clang: Inline some functions
Change-Id: I923919f206f038cf8cedf709b4047cbc22a990ee
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-05 15:26:41 +00:00
Orgad Shaneh
91c50e797b Themes: Fix gradient color in Projects mode
Change-Id: Ic8187fa3a04e76111afa231f993b115933cd3ac5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-01-05 14:53:59 +00:00
Christian Kandeler
e9cbb83b46 Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: I226d9d3f99ba119bfd16be690adb246c48c8e160
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-01-05 11:46:16 +00:00
hjk
c3d87e81c5 ProjectExplorer: Return BuildTargetInfo from availableBuildTarget()
... including build target name and display names instead of
returning QString build target names and producing display names
via displayNameForBuildTarget()

This is a mechanical intermediate step on the road to use
Target::applicationTargets().list uniformly as source of build
targets.

Change-Id: I7b0b1fb398d5061b0cec0b86890f9eaf0bb53a19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-05 09:34:29 +00:00
Christian Kandeler
af62a9590c QbsProjectManager: Fix reparsing after switching build configurations
After switching to a different build configuration, property changes in
the build config widget would no longer cause project reparsing. Likely
caused by e52ebbf217.

Change-Id: Ifebec74475def49885232ad71d4de01f51568fcb
Reviewed-by: hjk <hjk@qt.io>
2018-01-05 09:25:36 +00:00
Orgad Shaneh
94086e53bd Theme: Minor cleanup
Change-Id: I3dd776c1e67a3d8af67304917b25db848e64deb0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-05 09:03:18 +00:00
Orgad Shaneh
add1bdf43f Theme: Fix parsing of colors without alpha
Use QColor(const QString &) ctor instead of manual parsing.

Uncovered by a19005fc38 which made the
locator highlighting black.

Change-Id: Ic11483613510e3cf97eede396e9b7d53bbc3ff61
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-05 09:03:10 +00:00
Orgad Shaneh
6797ca18f6 Dark Theme: Fix bad color value
Change-Id: Ie798db7cd887ff3933832e8589c908b115699529
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-05 07:35:25 +00:00
Christian Stenger
b74fdc2e74 AutoTest: Fix updating when directory filter is toggled
Change-Id: I22dc2d1383280ea985127b69de114c93c4de3e68
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-05 07:23:35 +00:00
hjk
0cce7a82fe Debugger: Add some simple dumper for std::function
Linux/gdb only, pretty print the cases of default constructed objects
and real function pointers.

Task-number: QTCREATORBUG-19410
Change-Id: I08332af649bda861d9f53c0e0feb1f37db72b875
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-05 07:20:26 +00:00