Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
5fcfe97e23 Git: Detect rebase even if rebase-apply does not contain "rebasing"
It might contains only autostash.

Change-Id: Ie95c63bde2314aac1b6d37f01301822e41df177c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-18 11:55:30 +00:00
Eike Ziller
c412e0bb2a Fix that clang static analyzer did not find built-in headers
Clang expects these to lie in "../lib/clang" relative to the clang
executable.

Change-Id: I216860876591dca1fd728e4b1e79b4b07c965620
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-08-18 10:20:59 +00:00
Ulf Hermann
e0d7089f94 AndroidRunner: Process "ps" output on the device, not in Qt Creator
Previously, the code depended on the device to send the whole "ps"
output back quickly after "ps" was written to the shell. If the output
was not there by the time the input was considered written by Qt
Creator, we would mis-parse the port and generate wrong conclusions on
if the process was actually running or not.

By filtering the correct line from the ps output on the device and
outputting a clear negative result when none is found we can determine
the "running" status of the process more easily. Each output line
directly corresponds to the state of the process at the time when ps
ran. We buffer the output in order to guard against lines being broken
up during transmission.

Change-Id: I0e1726b7f0d725d982a0f2d60d0c8ab7d59fc371
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-18 09:40:46 +00:00
Ulf Hermann
2044a33f88 AndroidRunner: Remove _(...)
We don't need to do this for plain character literals as we allow
casting those to QString now.

Change-Id: I25569cfb8a2ff618176b7d5ab048f03ecaaee460
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-18 09:32:43 +00:00
Ulf Hermann
5f950a80cc Android: Run all of AndroidRunner in a separate thread
This removes the need for blocking queued connections and runAsync(),
reducing the risk of deadlocks and eliminating unguarded concurrent
access to various members of AndroidRunner. No mutex locking is
necessary anymore as all communication between the two threads is
either done on initialization, before the worker thread starts, or
via queued signals.

Change-Id: Icc2fcc2c0ce73d1c226bc4740413e57490d1cbc6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-18 09:32:34 +00:00
Ulf Hermann
8c5dd4ad49 Utils: Avoid soft asserts on comparing Utils::Port objects
operator== and operator!= should work if one or both of the ports are
invalid. operator> and friends are undefined if either port is valid
and should in fact trigger the assert.

Change-Id: I4e4c840fc243cf6c36bfa7beca9f6296336ba1d9
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-17 13:16:45 +00:00
Eike Ziller
b43765b3e8 Merge remote-tracking branch 'origin/4.1'
Change-Id: I5cacf96b5be4053d3a32a7c2a78fad463b9600d0
2016-08-17 15:14:57 +02:00
Tobias Hunger
a7cbae1e4d CMake: Make sure top level CMakeLists.txt file is listed exactly once
The toplevel CMakeLists.txt file should always be visible in the project tree,
otherwise there is no way to fix problems that stop creator from reading the
project structure.

Since the cmake configuration may add that file itself, creator needs to
check before adding that file. All other files are taken straight from
cmake, which makes sure they are unique.

See the minimal project attached to QTCREATORBUG-16671 for an example
triggering this issue.

Change-Id: Iff3e307134b023e6955f47657e998a5981b03da0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-17 13:08:45 +00:00
Tobias Hunger
906e81c745 CMake: Delete watched files when closing a project
Fixes a crash when re-opening a cmake project.

Change-Id: I5fc747f19787594964fe55c19e29e944c4a5092d
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-17 12:48:03 +00:00
David Schulz
9c333feb19 Allow focusing the bookmark view
This Fixes an issue when trying to open bookmarks in an external
windows.

Task-number: QTCREATORBUG-16524
Change-Id: I216f1d4f308a05abcbb4e074368dde30f0e05064
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-17 11:13:26 +00:00
Christian Kandeler
bfd0827811 QbsProjectManager: Make generated files available in project tree
Task-number: QTCREATORBUG-15978
Change-Id: Ia1890f1c4f8d1fa76568e42e15741281acb7dbb0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-17 08:25:24 +00:00
Nikolai Kosjar
f06a5db22b CppTools: Fix condition in file size check
Change-Id: I71d67f1273bad025b8dff45b3903b458f5cda2a2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-16 13:38:13 +00:00
Tobias Hunger
8c0fe8efea Debugger: Fix warnings about inconsistent use of override
Change-Id: I9c3a712dea2511c7b9a73f44881b38b4ca080933
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-16 10:28:19 +00:00
Tobias Hunger
0af4502115 Clangbackend: Fix warnings about inconsistent use of override
Change-Id: Ic9debe482a34637f838a1badbd0ef9fcb6651258
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-08-16 10:27:53 +00:00
Andre Hartmann
758544c058 GenericProject: Keep file list sorted when adding or renaming files
Change-Id: I064e9a00039671fbf626efa5227678800615ff1d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-16 09:33:59 +00:00
Takumi ASAKI
04e222784b ResourceEditor: Add text for keyboard shortcuts setting
Change-Id: Ifb6954c3fd203e3c9fae17a3ad2505b43ac35d98
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-16 03:20:26 +00:00
Jake Petroules
6776b78655 Revert "QbsProjectManager: Write MSVC compiler version to profile"
This reverts commit 3c63b621d9.

This is no longer necessary because Qbs determines the version automatically.

Change-Id: I80161ddf366091eca8bb1e1b29657371e9a7b0fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-15 17:05:30 +00:00
Jake Petroules
ac19d0691d Don't set cpp.linkerName for Qbs kits
This is unnecessary now that Qbs handles the linker automatically.

Change-Id: I8c6270f74355bfa274717a7791daf8d1f4721e00
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-15 17:04:55 +00:00
Ulf Hermann
bac2d18405 ProjectExplorer: Resolve any CurrentProject:<foo> in default build path
If ProjectMacroExpander doesn't resolve it we fall back to the generic
ProjectExplorer resolution, which is likely to pick the wrong project.

Task-number: QTCREATORBUG-16724
Change-Id: I201b722c5fe184905f744a1f344ec46941f92ae3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-15 16:27:50 +00:00
Andre Hartmann
7158ef3ffd GenericProjectWizard: Improve project file generation
* Sort the file list once, otherwise there might be some
  inconsistencies with files lists like "AAA.c AAA.h aaa.c aaa.h"
* Append a newline to end of .*files and *.includes as this otherwise
  happens when adding files later

Change-Id: If2b5e81d0f61c1a08c60e8151305534ef991865a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-08-15 15:10:27 +00:00
Eike Ziller
112bdc0f88 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id3be48ea1d00fadbec9a56d721688732118aab28
2016-08-15 14:42:47 +02:00
Alessandro Portale
6f9894bffa Todo: Add the new icons to qtcreatoricons.svg
...and re-generate the .pngs from there.

Change-Id: I6980f5e8488e43a08a34dc82c1dc2e96b9c24435
Reviewed-by: Serhii Moroz <frost.asm@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-15 12:11:38 +00:00
Christian Stenger
bb643a3cdc AutoTest: Refactor output handling
Handle getting output from application's process inside base class
and just process output inside the sub classes.
Additionally this is a preparation for being able to process output
for debugging tests as well.

Change-Id: I8a2289dc7faab25afe08530b5021a0318f3ba6a6
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-15 10:26:40 +00:00
Ulf Hermann
ce8bff4b31 Timeline: Calculate minimum event distances only when we have to
... and not on every single frame.

Task-number: QTCREATORBUG-14983
Change-Id: Id0724d3362ceca222cfdaaba60987b1269c8a5ae
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-15 09:51:51 +00:00
Ulf Hermann
f1e438ff90 Timeline: Optimize searching for hovered events
We can break the loop early under some conditions where we know that
the result cannot get better anymore.

Task-number: QTCREATORBUG-14983
Change-Id: Id047e6b3b990807db98a14e6fb36824abbecf101
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-15 09:51:13 +00:00
Ulf Hermann
0c1c54b426 QmlProfiler: Remove pointless QmlProfilerTimelineModel::clear()
Change-Id: Ib0d7f348be11cfdea8d52e1d4aa9ce8a3546517e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-15 09:50:05 +00:00
Ulf Hermann
6789f50018 Timeline: Unify TimelineModel's emptyChanged and labelsChanged signals
It doesn't make sense to distinguish between them. When the content
changes, the labels, the number of items, and the "empty" state
change.

Change-Id: I65f77f65828626fd76bfd968abf67b608b6e267b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-15 09:49:43 +00:00
Christian Kandeler
7eacb25ded QbsProjectManager: Re-add null pointer check
That one was accidentally removed in 0b3abfcf6a.

Change-Id: I01d2654175260f9efd1d01e5997170ce0d1faf0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-15 08:53:31 +00:00
Orgad Shaneh
cfc8ed41c7 Git: Some more QStringList cleanup
Change-Id: I0c6e8f768ee46985dab8ae14f88f2bc8d34fed26
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-08-15 07:30:06 +00:00
Orgad Shaneh
fedf5de551 Locator: Make completion list wider on wide screens
Take up to 2/3 of the main window size.

Task-number: QTCREATORBUG-11843
Change-Id: I9bcb8c839190cceab0e6213cb943c5f021bcb1e7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-15 07:23:32 +00:00
Alessandro Portale
30a71dc4b0 Timeline: Avoid blurred icons
Unset the "smooth" property of the image to prevent centered images from
being rendered to non-integer coordinates.

Change-Id: Iab0bdb971fa11dba7d3935d66a8b9b4bbd2739e1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-12 13:55:54 +00:00
Alessandro Portale
a6a3c25b0e Timeline: Add the "edit" icon to qtcreatoricons.svg
...and generate the .pngs

Change-Id: Id83bb65a8cc1b97bdee7df2270897ffa1816dab1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-12 13:51:04 +00:00
Alessandro Portale
845501b780 Timeline: Use the existing [un]locked icons
..and remove the own ones.

Change-Id: I513bb78f07d405aa9699157db292085a847adbe7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-12 13:49:36 +00:00
Alessandro Portale
743cf871c2 Utils: Move icon construction out-of-line
Saves several k object data per file.

Change-Id: Id73c3c88cb2ccd78cce68bd5db04bf0725f99d91
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-08-12 13:49:00 +00:00
Orgad Shaneh
a6c17fc537 Remove all QT_VERSION_CHECK
We only support Qt 5.6 now.

Change-Id: If94864400545b057623e3af0743c55ea1e84e33b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-12 13:29:58 +00:00
Alessandro Portale
f0b36b238a ProjectExplorer: Remove duplicated IOutputPane window titles
Change-Id: I9187feaccf137ca56f6db6c58367df84494e377f
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-12 08:00:29 +00:00
Nikita Baryshnikov
1bca287df2 ModelingLib: refactor a bit:
QMT_CHECK are replaced with QTC_ASSERT(, return) guards to not crash
 operator[.*] are replaced with at(\1)

Change-Id: I7e520a808550ed271ba5005dd6f5b084225ac8fe
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-11 16:46:18 +00:00
Alessandro Portale
c2d1bcb210 ProjectExplorer: HighDPI off-by-one fix for issues pane item delegate
Change-Id: Id0177f01b06cdfcfdc500f181abb49b4be0e20c4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-11 16:18:54 +00:00
Orgad Shaneh
8cc7e096d5 CppEditor: Fix typo in qbs file
Change-Id: I1ac2d04f8a34e61c1a08ce2e46f24408fc0846a6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-08-11 13:20:56 +00:00
Ulf Hermann
ec28a4b0f3 QmlProfiler: Work around QProcess not emitting errorOccurred
When given an empty string as executable and some non-empty arguments
QProcess might emit error() but not errorOccurred(). This was fixed by
2f0ffba638bdb868a810bc0349c240b6b6e172cd in qtbase, but we cannot rely
on that being present, yet. Thus, avoid passing empty strings as
executable.

Change-Id: Ia1bb5ebceb6edeca1e54489d12b838f3cea8851e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-11 12:32:27 +00:00
Ulf Hermann
51e074b0b7 Timeline: Remove TimelineModel ctor with private object
Change-Id: Ie4e50c08f77cd710f067f1c5e33a1656878e0640
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-11 12:32:19 +00:00
Marco Bubke
c5da4a3df8 Clang: Disable RTTI for refactoring backend
LLVM is normally not compiled with RTTI so we get link errors. We should
use "llvm-config --cxxflags" but before we can use it we should be sure
that we don't break something.

Change-Id: If45afcd625273230960a2c2065877f2512a53209
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-11 11:32:49 +00:00
Marco Bubke
de2eedf599 Clang: Add defines for llvm
Actually we maybe should use llvm-config --cxxflags but before we do
that we should evaluate possible compile breaks.

Change-Id: I534605c6f61217bfe985bef22af7d1dc9ac79637
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-11 10:24:58 +00:00
Christian Kandeler
0b3abfcf6a Update qbs submodule
To HEAD of master branch. Also do the necessary API adaptations in
QbsProjectManager.

Change-Id: I4709b7a0f35537f5b6f9fd04f4d95be16aef2c8d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-11 09:06:54 +00:00
Ulf Hermann
e84abe3af1 Debugger: Only use random QML port if none was given
This is a cherry-pick of 20db17e4f0 from
4.1. The problem also occurs in 4.0 and as another version of 4.0 might
be released, we should fix it there, too.

Change-Id: I3cf42abfa9d0ea5812495be6e2728264dc115ba9
Task-number: QTCREATORBUG-16708
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-11 08:43:07 +00:00
Marc Reilly
4bbd9dc0dc cppeditor: add resource preview hover handler class
This adds a hover handler which will preview images
from within project resource.

Change-Id: I88bcb56a977e41ed4dc5bfe165e2c80d4396a21f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-11 07:43:42 +00:00
Christian Stenger
5652aef54a Timeline: Fix compilation
Amends e59c16ef00.

Change-Id: I2b3e057d1f6474dbfb641ac70fe31c7e22512860
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-11 05:34:29 +00:00
Nikita Baryshnikov
58a4663bda CppCodeFormatter: removed unused member function
and modernized State

Change-Id: I4ea2a7d9ebd89e35ffc5ba2465bf4f781fde08f6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-10 16:39:43 +00:00
Nikita Baryshnikov
62a4e22fe7 AppOutputPane: check that index in range
this fixes regression introduced here
942d024bc6

Change-Id: Icc28341c87a5c390df91700530db434ce211725a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-10 16:31:27 +00:00
Ulf Hermann
e59c16ef00 Timeline: Remove TimelineModelPrivate::q_ptr
The only place where we needed it was {prev|next}ItemById, and that is
better done with a lambda.

Change-Id: Ie28b31479d5158b6fb85e3fb0e5ce3a02f7ff39d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-08-10 16:07:46 +00:00