Commit Graph

50929 Commits

Author SHA1 Message Date
Tobias Hunger
63c0fbc4e4 CMake: Cache cmake configuration only once
This fixes saves memory and fixes some update issues with the cmake
configuration, where the three layers of caches used to interfere
with each other.

Task-number: QTCREATORBUG-17360
Change-Id: I5564bbe46ca8de6b38dd710100bfc18fad98eac5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 12:00:09 +00:00
Tobias Hunger
5a88e4c9ad CMake: Fix the config model merging data
Old user-settings used to get lost.

Change-Id: I5197c3b57b12d94e7464a86261a1364dd9aca266
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 12:00:03 +00:00
Tobias Hunger
ea220ccec1 CMake: Emit necessary signal in server-mode
Change-Id: I35066deebbd0b7330cbf9864442073966af9203f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 11:59:58 +00:00
Tobias Hunger
b328a6357f CMake: Make project configuration win over kit configuration
removeDuplicates keeps the first instance, so pass in the project
configuration first.

Change-Id: I2549b8043905687fecc3b690f1d54456c42a4cf3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 11:59:54 +00:00
Tobias Hunger
168c5c67a2 CMake: No need to update the reader when it already is up to date
The reader notifies us about the configuration being changed, so there
is no need to tell it about those changes again.

Change-Id: I458947babf1cd9c50a66ea7863f37d1e43d6c5f2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 11:59:44 +00:00
Tobias Hunger
0edb16d4f3 CMake: Log server-mode teardown
Change-Id: I68ef20b855b9b7d6ed6fded9a599d74162a50390
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 11:59:37 +00:00
Tobias Hunger
46fb4f430f CMake: Clean cmake cache on compiler changes
According to the cmake developers this needs to be done.

Change-Id: I85670da11be31a71dd22fe2ea8d9102e47cc6535
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-02 11:59:33 +00:00
hjk
2275d68373 Debugger: Switch on QObject name display by default
... and use the option to govern general QObject guts display.

This allows people to completely avoid the performance impact
of attempted QObject display and still makes the feature
more prominent for our favorite use case.

Change-Id: I1e53b6448f646ab7eea9168a3cd24c77769e6328
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-02 11:23:46 +00:00
Leena Miettinen
a9b5e518d0 Doc: Try to make the Projects mode sidebar docs clearer
After receiving user comments.

Change-Id: I525aba5121f0ce629838fa5146f44120283c7f12
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-12-02 10:28:16 +00:00
Leena Miettinen
1db1efa271 Doc: Describe excluding large files when indexing
...in Tools > Options > C++ > Code Model.

Change-Id: I8efda2f62a4efd5c782cc4460a3b0c3eebbd23a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-12-02 09:57:23 +00:00
Christian Kandeler
ce5b08d9df User docs: Describe the "Force probes" checkbox in the qbs build step
Change-Id: I467bd9bb518e38d714edf535a6e2eb6e805a6708
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-12-02 09:53:49 +00:00
Maurice Kalinowski
de9c2d3bf0 Fix potential startup crashes
Change-Id: Id0f03b4fa9ff6a8f0f5b0de11fe51c3729065140
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-02 09:03:01 +00:00
Leena Miettinen
e2eb591c4c Doc: Update SCXML Editor screenshot
The icons have been changed. Also create "doc versions"
of two icons that did not look good when used in doc
generation.

Change-Id: I8b35e5ebdd2a837102fcb2826594b96914aeb1b4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-02 08:34:00 +00:00
hjk
2d5e6ef232 Debugger: Fix QObject parent pointer display
Change-Id: If8b6c7415d5cd6b8e5df6c2d760b015e3077c20f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-02 06:57:11 +00:00
Jarek Kobus
ed64ef4530 Use 3rd person in tooltips
Change-Id: I5a562f50acc3ba9bb14a8f87a5219ef311508076
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-12-01 20:41:59 +00:00
Alessandro Portale
15148d8e44 ProParser: Use the "Default Codec" when reading qmake files
This change adds a QTextCodec* member to QMakeVfs. It is used to decode
the qmake file contents in QMakeVfs::readFile. The QMakeProjectManager
sets it to the current "Default Codec".

This is necessary only in Qt Creator, where the parser would actually
use Local8Bit (unlike qmake's Latin1), which would sometimes lead to
misinterpreted multi-byte chars in comments swallowing newlines and thus
falsifying the actual code.

Bootstrapped qmake is not affected by this addition.

Task-number: QTCREATORBUG-17309
Change-Id: I34b42bd19e0de973deb2291e91f306d1ca7c630e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-12-01 17:06:41 +00:00
Ulf Hermann
a228ad7e49 QmlProfiler: Use QML_MIN_LEVEL in DebugMessagesModel
... replacing some magic numbers.

Change-Id: Ib77aa53d6b892867abe337a69b6f8caf89e58a14
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-01 16:08:44 +00:00
hjk
87e1093d59 Debugger: Fix QStandardItem test with namespaced Qt
Change-Id: I610dfddd519057c5464d89f42508108c7f8abb14
Reviewed-by: hjk <hjk@qt.io>
2016-12-01 15:28:24 +00:00
Leena Miettinen
6286d31da3 Doc: Fix typo "where" > "were"
Change-Id: I0dcbccfcbf29249149807c04f072d83fa503a895
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-12-01 15:13:27 +00:00
Tobias Hunger
1b0c2a28d1 Debugger: Fix cdbMatcher to match on wordsize
Change-Id: Iaf08cefb9327628d79a87e8664c38f96b6894e8c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-01 14:54:51 +00:00
Tobias Hunger
7c4d993640 ProjectExplorer: Avoid possible nullptr dereference
Change-Id: I1c82c4187e075055a44746879df1513e48853c22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-01 14:50:54 +00:00
Tobias Hunger
afa226ea23 Qmake: Initialize members of LastKit
Change-Id: I7effa619403df78acd34cab3d41a9913a1e4aea1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-01 14:50:30 +00:00
Tobias Hunger
9c26041b63 QmlDebug: Simplify messageclient
Change-Id: I6a5fbecc5c4cbdaff82ec671ad8667d6b187ee9e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-01 14:50:18 +00:00
Christian Kandeler
6a03705c27 qbs build: Fix one more relative path
Change-Id: If8ad1fd77b3f79a23cb46addf56a91465d530057
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-12-01 14:42:31 +00:00
hjk
aba0a6b9ce Debugger: Add dumper support for libc++'s std::weak_ptr
Change-Id: Ie9041f95159e85c81f108aeff1564be136e4b7ef
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-01 14:34:21 +00:00
hjk
a7fb4cd3ed Debugger: Make QStandardItem dumper work without debug info
Change-Id: Iccdc693616558d2d224c1145eee78f903792c4a6
Task-number: QTCREATORBUG-16908
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-01 14:30:37 +00:00
Eike Ziller
36b443dfba Add defines for relative data paths
Derive the relative paths used in code from the paths used by the build
system.

Change-Id: I208ee55d3c1ee76921734f5c1c6c40d3fcb9724c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-12-01 14:24:53 +00:00
Alessandro Portale
b3a9031b9f WinRT: Windows RT device icons
Change-Id: I6dfe99273b4c168bbaf4ec1bd647b42a6573949a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-01 12:21:58 +00:00
Eike Ziller
c269cc1c6d Revert "Revert "Revert "Algorithms: Simplify Utils::transform implementation"""
This reverts commit defb18aef4.
This reverts commit 602f8e72be.

The refactoring of transform does not compile with
MSVC2015 Update 2. Retry when we can upgrade to update 3.

Change-Id: I8bfd6ad12c71759af4840c2615d9a8f2390fd4bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-01 11:36:12 +00:00
Eike Ziller
6b0495d997 Version bump
Change-Id: I25f835a66200a1f578deff65ca83aeb02c217790
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-01 11:23:43 +00:00
Eike Ziller
c9208db68d Advanced Find: Check regular expressions for validity
If regular expression flag is enabled, check the search term for a valid
expression and disable searching in case it is not.

Uses QRegularExpression (Perl-compatible) which is used by all the
existing searches.

Task-number: QTCREATORBUG-14928
Change-Id: I37d536d8d0ac190de486790aca87616e9b320eb1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-12-01 10:44:22 +00:00
Leena Miettinen
0b02891b1d Doc: -1 is no longer supported in Diff Editor options
Change-Id: I83f19223cd78279a7c3946f7ffd0c85933c2a322
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-12-01 10:21:01 +00:00
David Schulz
54a363b36c Debugger: Move symbolgroup indices after expanding
Change-Id: I0c2078b5c780a8f8f018e72c27575825c076cdd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-01 10:16:29 +00:00
Christian Stenger
681efe2324 Dumper: Fix std::once_flag dumper when using libc++
Change-Id: I5f320153f6ace6aecfad12f6156bba700fe7ad85
Reviewed-by: hjk <hjk@qt.io>
2016-12-01 09:23:27 +00:00
Leena Miettinen
e48c2e516f Doc: Describe Model Editor zooming commands
Change-Id: Ie2838120eab37430449f85cd2f84e773b26a5c8a
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-12-01 08:55:54 +00:00
hjk
c944d08702 Debugger: Make {boost,std}::shared_ptr display more compact
After debugging through a code base that makes extensive use
of shared pointers (LLDB...) I came to the conclusion that the
display of weak and strong counts is pretty much useless and
it would be better to avoid that level in the display.

Change-Id: Ie03b05fff4f7f5b7dced2e656b404e8e7938cc25
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-01 07:50:23 +00:00
hjk
53022f01fd Debugger: Add dumper for std::once_flag
Change-Id: I8b5166fc0e7d54676b84a1b0d45c6a2793c2a37c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-01 07:09:00 +00:00
Marco Bubke
b888520598 Utils: Reserve in smallstring was flaky
We have to copy the content of SmallString before we instantiate a new
constructor in the same memory. So the content to which data() is pointing
can be already invalid.

Change-Id: I3a0ab4f9ac0c1219c2bd75fc4412eaf56209ca64
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-30 15:32:48 +00:00
Thomas Hartmann
91bce7abef QmlDesigner: Removing wizards for QtQuick.Controls 1
Change-Id: I29d588021a5bf44af7a8f53e71363b96713d576c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-30 15:21:32 +00:00
Leena Miettinen
91a82fe8b2 Doc: Describe and link to Qt Quick Controls 2
Remove info about Qt Quick Controls 1.

Change-Id: I25f4915cc33df1bca010900ba8d07ed6cc21f207
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-11-30 14:36:09 +00:00
Alessandro Portale
ba30a5654d ProjectExplorer: Remove IDevice::[set]Icon
It turned out that IDeviceFactory::iconForId is a better solution which
supercedes the IDevice specific icon.

Change-Id: I82cd7aefc97e515849d00f59b87a8ba34082d0a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-30 14:33:21 +00:00
Tobias Hunger
49e255c4d5 CMake: Check result of file open
Change-Id: Ia4a11359f7cb08ee3fa55c77dc54d42890f37845
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-30 14:24:55 +00:00
Tobias Hunger
2d8d90bc79 CMake: Cache buildtargets in builddirmanager
No need to have the builddirreaders to so.

Change-Id: Ia7e38f6483b29d6a4f4b65baacc17bf184a3cb34
Task-number: QTCREATORBUG-17359
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-30 14:23:36 +00:00
Tobias Hunger
c9be75fe65 CMake: Handle executables properly in server-mode
Change-Id: Idabfc2449377d0d81cc1639ad4992d8710ec8b7d
Task-number: QTCREATORBUG-17359
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-30 14:23:28 +00:00
Tobias Hunger
c54fe23579 CMake: Send compact JSON output to cmake server
Change-Id: I0e02f122bdb2b1b417a70aa4933cc4246d6969c6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-30 14:23:16 +00:00
Eike Ziller
e487b3bd55 Merge remote-tracking branch 'origin/4.2'
Change-Id: I575f1cf98f2a4740577cdd94da21687d3392cdb7
2016-11-30 15:09:11 +01:00
hjk
ac2ceb36d7 Debugger: Split related settings
GDB's 'target extended-remote' and 'set detach-on-fork' are related,
but neither the same nor orthogonal. Better use two bools.

Task-number: QTCREATORBUG-17264
Task-number: QTCREATORBUG-16978
Change-Id: I50dfcdf8f69fadcc6dff2dcf632e4bdfe28a28bf
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-11-30 13:56:46 +00:00
Alessandro Portale
a00ee753fe ProjectExplorer: Introduce IDeviceFactory::iconForId()
This adds the possibility to have an icon for a device type. Now,
a Kit can have a proper icon if just the device type but not device
is selected.

Change-Id: I2a382ffd5b46cbbf74cdd0b934b3d450d300bfff
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-30 13:55:38 +00:00
David Schulz
bae72fcc51 Debugger: Fix MSVC python dumper for std::vector
Change-Id: I843f6195a9d51066eae57b7d383a0450fe4c56a1
Reviewed-by: hjk <hjk@qt.io>
2016-11-30 13:41:12 +00:00
Tobias Hunger
2584366f6e Todo: Simplify code
Qt::ForgroundRole and Qt::TextColorRole are aliases for the same thing

Change-Id: I5d5e9ad562a7308988ba3bc402ef8b81872825b8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-30 13:39:49 +00:00