Commit Graph

44349 Commits

Author SHA1 Message Date
BogDan Vatra
c4afe5d79b Android: Fix keytool result handling
keytool return code != 0 if the password is incorrect.

Task-number: QTCREATORBUG-17317
Change-Id: I248b4a687ef48a849d42a70940009738d29a609c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-05 09:07:20 +00:00
Tasuku Suzuki
ac83af4ef0 Git: Add Sign off feature in git commit view
Change-Id: Icb0a8818f707d6a874a9b97318fc6a93205b4ce9
Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-05 08:17:33 +00:00
Friedemann Kleint
9ceb1b504a MSVC toolchain: Add common mkspec added in Qt 5.8.1
Prepend "win32-msvc" to the result list. Projects based
on Qt 5.8.1 will then no longer be misconfigured with ARM
toolchains.

Change-Id: I734ee530e4fe2c5253f946568c2ab973e51d3cae
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-05 07:24:06 +00:00
Ulf Hermann
405c456d0d QmlProfiler: Print timestamps with context
For traces that start at a high timestamp, we want the timestamps to
still have some meaning. Without context the formatter will only
print something like "5h 25m" for all of them, which is not very
useful.

Change-Id: I7ec37659083f967c9ed03a843f6b7c9430214670
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-04 16:57:03 +00:00
Eike Ziller
144d817b76 Remove duplicate includes
Change-Id: I12af32a2b0cc66b4373d8ac5028f4d4cb6400c71
Reviewed-by: hjk <hjk@qt.io>
2017-01-04 16:41:32 +00:00
Ulf Hermann
59c186de5f QmlProfiler: Resolve pixmap file name via pixmapcache model in test
This tests that the file name is correctly stored in the model and it
removes the detour via the model manager.

Change-Id: Icc592b6383edcb18bfe31a81eb7ae0736a4f5508
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-04 16:39:24 +00:00
Ulf Hermann
5dd4b7d8fe QmlProfiler: Simplify stack handling in statistics model
There is no need to keep empty events at the bottom.

Change-Id: I072b50329a9f277005cbfa45350c060abd7e7a36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-04 16:38:55 +00:00
Ulf Hermann
ba46ebc0f2 QmlProfiler: Remove unused member
Change-Id: Ieea5c09903477c9a9cb3ad158404ffe893f95c55
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-04 16:36:09 +00:00
Ulf Hermann
8a4c55b6cf Timeline: Improve display of time labels
As time labels are formatted with a precision that matches the context
we are generally interested in the right part of the string if it
doesn't fit into the cell. Therefore, elide left. Also, the label
corresponds to the line left of it, so put the margin to the right,
rather than to the left.

Change-Id: I953b1bc674e131dbfcf873774127c6360163f20f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-04 16:33:25 +00:00
Ulf Hermann
0f6d7dae8f Timeline: Fix time formatting for very large timestamps
10^12 doesn't fit into a 4-byte integer and we want to adjust the
minutes when printing hours, not the hours themselves.

Change-Id: I722403b8cb7f6817aed1b6a5e3c406349fe1bd53
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-04 16:33:17 +00:00
Eike Ziller
e0dd885338 PluginSpec: Use member initialization
Change-Id: Ie8720248eca88ec447461b54b27928c25dace97e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 16:32:42 +00:00
Tobias Hunger
be4d1093b4 ProjectExplorer: Do not crash when setting custom executable
Do not crash when setting custom executable without ever visiting
the runconfiguration before.

At that point the chooser is still a nullptr.

Task-number: QTCREATORBUG-17505
Change-Id: I27fb19845adf9c7ec0ad5a9435c8d86a573a2532
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-04 16:20:42 +00:00
Orgad Shaneh
86af16725d Revert "SDKtool: Warn if file is not found"
It is not an error. SDKTool can be used to create new files.

This reverts commit 274d3a8c79.

Change-Id: I4af46b4deb5fe356a9c1050cc9557d43f3a91a6e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 15:14:57 +00:00
Thomas Hartmann
02ee25b490 QmlDesigner: Attach and detach TextEditorView
This is required for the TextEditorView to get the
notifications from the model.

Change-Id: I8d548e3018f217466f15a469d428894e66e74c39
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:50:41 +00:00
Thomas Hartmann
75bcd04a9d QmlDesigner: Proper selected highlight for center widget tab
Change-Id: Ic29dd933eb26defe201f459211281655e1301484
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:50:31 +00:00
Thomas Hartmann
3d48d7565c QmlDesigner: Delay and compress text changes from editor
This is required to avoid blocking the ui while typing, because
the model is updated.
It will take 400ms without changes to the text until the model
gets updated.

Change-Id: Id428a52c15aeb8f0b802ee0448be8e6777a7402a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:50:25 +00:00
Thomas Hartmann
2322f70fb6 QmlDesigner: Fix for changing type
The type of the root node is handled differently.

Change-Id: I360095c97184230502c8d80fbcb7ef7815f0a177
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:49:57 +00:00
Thomas Hartmann
477e5e6b7e QmlDesigner: Keep track of the collapsed state of sections
When a section in the item library is colllapsed, then
the designer should remember this. This was already implemented,
but the feature stop working, because of refactoring.

Change-Id: Ib4465b87ade7b0c8ff501dea9893ee98caaae753
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:49:44 +00:00
Thomas Hartmann
fad8644041 QmlDesigner: Adding simple performance logging to property editor
Change-Id: Idc8adce4ce245a9e470b898473ec9b02143827b2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:49:25 +00:00
Thomas Hartmann
3d168b67cb QmlDesigner: Do not throw in destructor of transaction
In C++ noexcept(true) is the default for destructors.
Instead of poluting the code base with noexcept(false),
we catch the exception inside the destructor of the transaction.
Typically the application code does not anything special to handle the
error, so showing the error message is good enough.

If the application code wants to handle exceptions commit()
has to be called instead of relying on RAAI.

Change-Id: Ic73cacb197737698454eca9270d07fd897c97ca8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:26:25 +00:00
Thomas Hartmann
d4aa4523b7 QmlDesigner: Avoid throwing in the destructor of transactions
Since C++11 destructors do not throw by default.

Change-Id: Ic6403704587999464011fcaa1f9ac7df3e4ee49d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:26:17 +00:00
David Schulz
f4aa5d8494 Debugger: Use GetTypeId if module is known
Change-Id: Id8d742796ac89eb43778f2a2ece3a6717b27bc1c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:50 +00:00
David Schulz
a95b3457a3 Debugger: Restrict symbols added to the list of locals
Change-Id: Ie1f7d717f1f9883f6545c128c1dd07c7932e0ec1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:46 +00:00
David Schulz
34f4c758b5 Debugger: Reduce transfer of ownership in cdb python interface
Change-Id: Ie94e8c38095d05aae8b215b99d192acde4a13165
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:41 +00:00
David Schulz
efd3ce4627 Debugger: Extract type check data to functions
Change-Id: I07d44ef9ac88c627256394e0f3051c77a683bd36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 11:58:37 +00:00
Andreas Pakulat
69159ab483 Refresh generic project when build config changes
Now that the generic manager can use data from the target or the build
configuration for expanding entries in its projects files it is
important that it reacts to changes of these entities. A change in the
build configuration can change the include directories or even compile
flags stored in the project configuration and hence the C++ code model
needs to be updated to reflect such changes.

The code is based on the qmake's project manager which has similar
functionality as far as I understood. The only difference is that the
generic manager won't attempt to refresh its state in the background (as
it simply can't do that right now) so the ui will be blocked for a bit.

Change-Id: I0a85e1ff0deeb876a7934b9a193a5d0f020047c7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 11:08:49 +00:00
Andreas Pakulat
c79d290ca2 Expand macros in generic projects configuration files
This adds the ability to use macro's provided by various parts of
QtCreator inside the .includes or .files file. In particular the build
directory of the current build configuration or Qt variables of the
current kit (accessible through the active target's macro expander) can
be useful but I suspect its possible to find other use-cases as well.

Fall back to the project's own macro expander if there's no active
build target to allow this to happen some day, even if that expander does
not have many useful variables.

Change-Id: Ic3b7b744b5d0ae24247ad929b73d7c72abfb8bb3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 11:08:36 +00:00
Konstantin Podsvirov
ec6587ceb6 CMake: Allow CodeBlocks for NMake Makefiles JOM
Change-Id: I280deb2131959cc538c4af4b7e9b9e07b4f41b80
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
2017-01-04 10:09:57 +00:00
Vikas Pachdha
1e8c0c3632 iOS: Find Xcode version
To enable/disable the version specific features

Change-Id: Ia4cbe83f0aae366f517d8b46f322d8202dbbe3c8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-01-04 09:51:44 +00:00
Orgad Shaneh
ffabc5dff1 QmakePM: Fix false positive warning for incompatible compiler
Some users set 'QMAKE_CXX = @echo $< && $$QMAKE_CXX' to prettify the
compiler output.

Another useful case for "incompatible" compiler is ccache, or other
compiler wrappers.

To eliminate warnings for these cases, pick the last value of QMAKE_CC/
QMAKE_CXX, excluding flags, and compare it against the configured toolchain.

Change-Id: Idc3b9377e6f7c39c09c50f36ec89460756510b97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 09:26:29 +00:00
David Schulz
1a98c6cfa7 Debugger: Make list of modules available in cdbbridge
Change-Id: I56938285c728ed0316326782aed47d418f08bc80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 09:06:09 +00:00
Eike Ziller
3ef8ebd436 Explicitly mark experimental plugins as such in plugin overview
This makes the difference between "experimental" and "disabled" visible
in the UI.

Task-number: QTCREATORBUG-17368
Change-Id: I6a74d27dbad9d35f447fe5687fe26c4eee3a3808
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-03 14:21:18 +00:00
Eike Ziller
09e071b480 HelloWorld: Make DisabledByDefault instead of Experimental
Change-Id: I1828d49358cfaa01940600425d9b53bf122183a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-03 13:09:16 +00:00
Eike Ziller
7b3c2f33f4 UpdateInfo: Make DisabledByDefault instead of Experimental
Change-Id: If51b6cefd3dd985b26244ddb1f7b88c38e82ec9e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-03 13:08:58 +00:00
Ulf Hermann
55d6997154 QmlProfiler: Only show pixmap cache size on cache change events
... and make the default size 0, rather than -1. Showing cache sizes
for individual pixmaps doesn't make much sense as other pixmaps might
get loaded at the same time.

Task-number: QTCREATORBUG-17424
Change-Id: Iead21c21d87b454ef03961d22119e0f5351d11ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2017-01-03 12:40:42 +00:00
David Schulz
577ab21b30 Debugger: Add a "use python dumper" setting
Change-Id: I8bed1a8641e5cf46f50f7c9fced9a1b6c01964ed
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 10:58:07 +00:00
David Schulz
e7ffd1eefc Editor: Avoid setting text cursor when clearing block selection
Task-number: QTCREATORBUG-17475
Change-Id: I0266530c8c2ba10bd14dcb26b946cc51a825600f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-03 10:06:02 +00:00
Przemyslaw Gorszkowski
3c9c76c6f3 GenericProject: show project files in "Project" tree
This missing project files(*.files, *.includes, *.config) in "Project"
tree is a regression.

Change-Id: Ib7380b1627a0f31045a25bc152352f5d2c82342a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-03 08:29:34 +00:00
Christian Stenger
6137d14857 AutoTest: Avoid scheduling single shots if not necessary
This avoids doing internal stuff based on getting respective
signals if there is no active test framework.
The only signal that still will perform some more internal stuff
is triggering a rescan from the context or global menus.

Change-Id: I78f065b6bc77a100676d63248b438d3ebc71809b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 07:02:10 +00:00
Christian Stenger
b9fc628bb9 AutoTest: Fix result tree for google test
Change-Id: I1f4a361a3c4ceb77c221d6549e42a1b7803ef305
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 07:01:37 +00:00
Christian Stenger
41ceac474b AutoTest: Avoid building tree of global items
Global items normally have no test name set. This patch avoids
adding global items below other global items.

Change-Id: Iabada78144ec48fc6687b360f79f1ef017c772a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-03 07:01:13 +00:00
Daniel Trevitz
a8854b680e RemoteLinux: Add incremental deployment to the TarPackageCreationStep
Patch adds incremental deployment to the tar ball creation. Allows for
only changed files to be deployed in a single tar ball.

Change-Id: I28a0bd1220503125b75a664323b72906b479b821
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-02 23:21:41 +00:00
Andre Hartmann
5d3cabb4e6 GenericProject: Remove unneeded check
toAdd is a QSet, so insert does nothing if directory is already
in the set.

Change-Id: Ic7d593414bef95a84f624c39208e29b0ec8c01f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-02 21:53:44 +00:00
Andre Hartmann
70556e8495 GenericProject: Cleanup and modernize
* Use nullptr instead 0
* Remove QLatin1{String|Char} where possible
* Use C++11 list init and auto
* Add some const as drive-by-change

Change-Id: Ife4c9c7b0869bcf2c864b88b8061ac6b7c3f33c0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-02 21:53:23 +00:00
Orgad Shaneh
92b49c2eb2 Utils: Fix "Unused result" warning in process stub
Change-Id: If0fbe55106936526ec4993963f2cb0dc4041f937
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-01-02 16:10:44 +00:00
Thomas Hartmann
afb52340f6 QmlJS: Adding missing properties to Font value property
Task-number: QTCREATORBUG-17511
Change-Id: I2298bb76bc85b11954a0be1b551972dddefbebbf
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-01-02 14:47:35 +00:00
Ulf Hermann
018ba5a834 Rename the "ERROR" icon to "CRITICAL"
We mostly use this icon in terms of showing messages which might be
informational, warnings, or errors. We cannot call the icon "ERROR" as
that clashes with some macro on windows. To be more inline with Qt's
predefined messaging macros (qDebug(), qInfo(), qWarning(),
qCritical(), qFatal()), we rename the icon to "CRITICAL" and regroup
the entries in the header to suggest this usage.

Change-Id: I89880919d7ca54ea9c86de384eb29f375bf3075f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-02 12:27:54 +00:00
Ulf Hermann
3ed12811e0 QmlProfiler: Remove unused include
Change-Id: If7334bc067fde54fcc7806c0e785fe694bcbcf4f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-02 12:00:02 +00:00
Ulf Hermann
90e09f7658 QmlProfiler: rename requestId into typeId
No need to invent a new name for the same thing.

Change-Id: I370ec7be9c762642ae35e4f7a60ff9f5eb8ae3fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-28 10:48:42 +00:00
Ulf Hermann
795b8bcb9e QmlProfiler: don't manually delete parented QObjects
Change-Id: I8098cdb09fa347d7c792ee34e51ad31be85923a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-28 10:48:38 +00:00