Commit Graph

56049 Commits

Author SHA1 Message Date
Tobias Hunger
b6c9879f41 ProjectExplorer: Remove support for .user files pre version 3
The code handling the transition to targets/kits is huge and rarely
used (if at all) and has been changed way too often for me to feel
comfortable that this will still work reliably.

Let's get rid of it.

For reference: Qt Creator 3.0 was released December 12th, 2013
(http://blog.qt.io/blog/2013/12/12/qt-creator-3-0-released/)

Change-Id: I75dd3cc92a7231904105d7fc68c2ca029e6a571e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-18 12:26:53 +00:00
Eike Ziller
56cd442693 Merge remote-tracking branch 'origin/4.7'
Change-Id: I441f2b093992fcc7af29541681206bd3175614e3
2018-07-18 12:03:08 +02:00
Orgad Shaneh
afb60d0434 VCS: Use namespace Utils
Change-Id: I41c818362398fd194995baf5b1adb16899e83217
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-18 08:44:45 +00:00
Tim Jenssen
dc29aafb52 add IDE_SOURCE_TREE to the doc environment
we want to use images from some plugins and to reference
those, we need IDE_SOURCE_TREE variable.

Change-Id: Ia7e83a4d2e65ff34a839732fb24a0804aca007d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-18 07:19:55 +00:00
hjk
e2144db165 Debugger: Pass native gdb.Value to native gdb pretty printers
Task-number: QTCREATORBUG-20770
Change-Id: I6ea92faf0c9314c50da05356fa9004f87124111a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-17 09:10:03 +00:00
Robert Loehning
d49693c22b Clang: Remove invisible string
Change-Id: Ib60badf134e884f1a02abdf791d2516d076eee0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-16 16:00:47 +00:00
Orgad Shaneh
dedbb40f57 Remove copying settings from Nokia directory
Change-Id: I550b62ab74505f72eee5c8daba206f80dd5a3a34
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.7.0
2018-07-16 13:13:05 +00:00
Robert Loehning
e1d8489262 AutoTest: Harmonize capitalization of "GTest filter"
Change-Id: If3fe511a26234ac96767f5d7370106aee9b80ca7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-16 11:29:21 +00:00
Ulf Hermann
37bcbf7575 Tracing: Make sure we don't cast between different kinds of events
Add a classId to TraceEvent and TraceEventType and add is() and as()
methods that check for it.

Change-Id: I76fe1df624516b36db90d57d4788b17e0b690726
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-16 10:03:59 +00:00
Ulf Hermann
c73c86e1a3 QmlProfiler: Remove extra file cache
The FileInProjectFinder has its own cache. We don't need to duplicate
it.

Change-Id: I90450ac734953e3747e55cb74505dd48e5f22f6e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-16 10:03:42 +00:00
Ulf Hermann
c679b3202a Tracing: Simplify TimelineModel signals
Instead of laborously calculating which properties have changed under
which circumstances, we can just connect the signals of dependent
properties. This will give us a few false positive signals at a greatly
reduced risk of missing some actual change. Also, the number of expanded
and collapsed rows will always be determined by the content of the
model. We don't need separate signals for those.

Change-Id: Id8495ee525a91405b039fd032509afa125f96412
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-16 10:03:30 +00:00
Ulf Hermann
96982d6177 Tracing: Use std::unique_ptr instead of d_ptr for TimelineModel
The d_ptr mechanism has no benefits here and just adds overhead.

Change-Id: I5327bf6fab3b531b892dd85da35f1d07c7ac4c5d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-16 10:03:21 +00:00
Alessandro Portale
8d19333075 ProjectExplorer: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default
modernize-use-transparent-functors

Change-Id: Iebed22caa2e733d292f334e956e3d16b844e14e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-16 10:01:53 +00:00
Ulf Hermann
af8bd12387 QmlProfiler: Don't scan the whole file system in rewriter test
QLibraryInfo::location() returns one string. Iterating over that gives
us the individual characters, beginning with '/'. Running that through
FileName::fromString(), gives us "/", and feeding this to
ModelManagerInterface::importScan() is not funny.

Change-Id: I627e5739337efacc0632d8a476bb5ad3093793ea
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-16 09:53:06 +00:00
Ulf Hermann
d1d4d0cdcd Qml Profiler: Do toggle extended statistics when option is checked
Task-number: QTCREATORBUG-20778
Change-Id: I3390241c25ab7a87329bc8b20c49c32cf4c02944
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-16 09:41:54 +00:00
Orgad Shaneh
6019f8f40e BinEditor: Fix "Find Next" for a single char
Change-Id: If35807230969d3620a3a9018af8d2c21236cd58d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-16 07:56:05 +00:00
Robert Loehning
fd782687fe BareMetal: Fix default display name
Change-Id: I30b3985ce30cedd4f7cefda95bb5a5bf2e2acc6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-13 16:30:42 +00:00
Robert Loehning
4d85b6fc7e Android: Fix error messages
Change-Id: Ib7f996d65d5d50b1c7cbea399bccc1c87ba0e9e6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-07-13 14:30:43 +00:00
Eike Ziller
4ea3dcd701 Update changelog for 4.7.0
Change-Id: I90aef93f9794393002be830e4279ed28f9a3fcef
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-07-13 13:44:07 +00:00
Leena Miettinen
8daca461c2 Doc: Add 3rd-party libraries to Acknowledgements
Reformat parts of the existing text.

Task-number: QTCREATORBUG-20682
Change-Id: I019146d3861fe57258ba0ddc84ed3ed576128da9
Reviewed-by: Xing Xiong
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-13 12:35:45 +00:00
Eike Ziller
2410443237 Merge remote-tracking branch 'origin/4.7'
Change-Id: I143aabee9c64a348f2cadb315f06648e0b7d48af
2018-07-13 14:17:12 +02:00
Robert Loehning
0374549b1e ImageView: Fix brace in string
Change-Id: I08c0b74930cccea4674ea559c64de9fff8cd1791
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-07-13 12:06:38 +00:00
Tobias Hunger
a92f39ec35 ProjectExplorer: Make Collapse All action for project tree work
Creator registers a "Collapse All" action for the Project tree. Make
this work again.

Task-number: QTCREATORBUG-20771
Change-Id: I49f1c8a97c4eb22ef6f7f703eefdfe46c3c0a035
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-13 11:31:18 +00:00
Tobias Hunger
8c6854b421 KitManager: Simplify merging of loaded kits
Change-Id: I7d1a8706ad5e85caadf2d41b56c9c3cc00c5a276
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-13 11:16:33 +00:00
Tobias Hunger
e20075f8cf ProjectExplorer: Trigger environment evaluation on current project change
This makes e.g. %{CurrentProject:VcsTopLevelPath} in the kit's
environment much more useful.

Task-number: QTCREATORBUG-20752
Change-Id: I4bf49e61a7a7281a6c9bf039a1d9118b6e4060ef
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-13 11:06:28 +00:00
Tobias Hunger
a94fcbd1e7 ProjectTree: Fall back to startupProject as current more often
Fall back to SessionManager::startupProject more often.

Creator used to have ProjectTree::currentProject return a nullptr
e.g. right after the first project is loaded via the menu (and before
the Project tree widget is 'touched'). It also returned nullptr
when closing a project via the menu (again till user interaction
with the Project tree widget).

I think this is wrong, especially in the light of %{CurrentProject:Foo}
macro expansion.

Change-Id: I1c980382548792181584ec3dfc0d919e939111d8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-13 11:06:15 +00:00
Tobias Hunger
9452c36025 ProjectExplorer: Simplify BuildConfiguration a bit
Change-Id: Ia44049039c32a598b6da212290d339b8f3705835
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-13 11:05:59 +00:00
Alessandro Portale
cd5066d86b QmakeProjectManager: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-equals-default

Change-Id: I7642992eee6838bb2566921de87390c1771ebcbe
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-13 09:25:21 +00:00
Robert Loehning
02d46e6c2c SettingsAccessor: Fix placeholder
Change-Id: I3bb6a2646f2c424feb0123ea0aeef07c4c16421a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-13 09:23:04 +00:00
hjk
ef0cf8d1e0 Debugger: Continue startup in case of errors also in localized GDB
Change-Id: I7840e2a398e3ad50cb5526fa2a81584f02beec78
Task-number: QTCREATORBUG-20765
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-13 07:24:24 +00:00
Orgad Shaneh
10fc3595a3 Clang: Suppress class-memaccess warnings for GCC8
They appear a lot in Clang headers. Until this is fixed in Clang, suppress
them.

Change-Id: I5292ae442089aec3f52ba846ee21e0bd9e61d0cb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-07-13 06:21:28 +00:00
Alessandro Portale
1c014ed3d9 Windows: Match the name case of included files
Although Windows is case insensitive, and lower case always works, Clang
complains:

Lexical or Preprocessor Issue: warning: non-portable path to file
'<FooBar.h>'; specified path differs in case from file name on disk

Change-Id: I8f94e9fb62f6afec8aa6b9d08a7c78f6ba8a4435
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-12 20:12:30 +00:00
Robert Loehning
69f75036ab Squish: Remove unneeded function call
Change-Id: I3fb85bc69086501dada922b45ef353e34030e0db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-12 14:31:34 +00:00
Robert Loehning
7e3cdbe548 Squish: Remove unused variables
Change-Id: I24d8ecbe7e7208a20d0f27f62d5b8f488d2a240a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-12 14:31:18 +00:00
Tobias Hunger
9edd80770e KitManager: Do not create lots of desktop kits
Change-Id: I563e34bc2594f05da35bb723947276f02d5846fc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-12 13:38:23 +00:00
Eike Ziller
98479ba312 Merge remote-tracking branch 'origin/4.7'
Change-Id: I00b0009867322be55c215351054acc7de5b9e335
2018-07-12 14:56:13 +02:00
Ulf Hermann
d7733bafe1 Tracing: Don't rebuild flame graph if there is nothing to see
If the root size is 0, none of the nodes will be visible. Don't create
them in the first place.

Task-number: QTCREATORBUG-20772
Change-Id: I9595daece2d17fe8202b322ffafd361d6fa422fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 12:53:23 +00:00
Tobias Hunger
c17a1ce249 CMakeTool: Move introspection data into separate class
Change-Id: I53dd2f6f09f164042fe796761678b93f1f99bb75
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 12:21:40 +00:00
Christian Stenger
3a4592609c AutoTest: Handle direct usage of quick_test_main
If users need to register additional QML types before Qt5.12
they need to bend the Quick tests magic a bit and use
quick_test_main or quick_test_main_with_setup directly.
The plugin supports something similar for QTest::qExec, so
allow this for Quick tests as well.

Task-number: QTCREATORBUG-20746
Change-Id: I672f8410914c6cc77abc901998f419dda35755ae
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-07-12 11:26:07 +00:00
Tobias Hunger
22568df2e8 ProjectExplorer: Small header cleanup
Change-Id: I110320198363f4d349d709c28bafcefebf9ff267
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 11:04:54 +00:00
Tobias Hunger
a33c72a08c KitManager: Remove temporary kit list
Change-Id: I4cf595e8c297040e936d8b4391e6df414828fb1f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-12 10:36:39 +00:00
Eike Ziller
0471fc0f46 Fix assert when filtering examples / tutorials
The examples are put throw two proxy models. The first one implements
the sorting and filtering, the second one transforms the list into a
grid.

The grid proxy model was based on QIdentityProxyModel, which is wrong
because that explicitly states that it should be used when the structure
of the model stays the same.
Even QAbstractProxyModel works under the assumption that all items in
the proxy model correspond to an item in the source model, which is not
true for a N*M grid.

Just implement the proxy model "by hand", making sure that all items
that cannot be mapped to the source are handles correctly as "empty"
items.

Task-number: QTCREATORBUG-20641
Change-Id: Id08b77bb7157b893b9d0d73dc006db98d90032b7
Reviewed-by: hjk <hjk@qt.io>
2018-07-12 10:16:26 +00:00
Tobias Hunger
293e711739 ProjectModel: Fix crash when updating parsing state of project
Fix crash when updating the parsing state of a project during the time
between the project being removed from the session and the time when
the project is actually destroyed.

Change-Id: I54bf4793626497315fe588ebb68474b880de2984
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 09:57:49 +00:00
Tobias Hunger
e6cfe06dfc CMake: Fix building on current executable target
Task-number: QTCREATORBUG-20763
Change-Id: Ie25c0993c1c2051de3f6a15fca56b56caaa04b00
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-12 09:57:20 +00:00
Andre Hartmann
2b45a44ee1 FileProperties: Use native separators for file path
Change-Id: I66c9f62b0c48165f5160d117ad3f0cf5e84f686b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 09:09:10 +00:00
Eike Ziller
93434cf5d1 Fix that Qt Quick Designer did not request Design mode creation
If you turned off Designer and ScxmlEditor plugins, you'd not get Design
mode even if you have Qt Quick Designer.

Fix-up of 299da01332

Change-Id: Ib3a269db9630af09c36968435ca0b0d998cc1709
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-12 08:51:34 +00:00
Christian Kandeler
c4cc4219cd Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: I3b0115655d3f3735730250a06b96805bc343dee8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-07-12 08:32:40 +00:00
Leena Miettinen
41493d24f0 Doc: Replace title with HTML filename as value of \contentspage
To make links work if the title changes.

Change-Id: Icf516e74c68efc3b26689aaec27f28ee7ae51ce3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-12 08:27:01 +00:00
Tobias Hunger
20ce7887ec ProjectExplorer: Remove margin around Environment KitInformation
Remove margin around the Environment widget of the kit.

Change-Id: I64deee380c404d1bc55f01d25f20a54be3a7afe0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-12 08:26:55 +00:00
Alessandro Portale
ad474f5fcb Fix: member initializer for 'm_fooBar' is redundant
warning: member initializer for 'm_isValid' is redundant
[modernize-use-default-member-init]

Change-Id: Icd521e7d77054512bc0ed6b95cf08440320b0ce0
Reviewed-by: hjk <hjk@qt.io>
2018-07-12 08:19:00 +00:00