Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
ece8b17ab2 Core: Delete unused empty files
Change-Id: Iafb0ed2d65e68afae57c953bcb51e84a92823445
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-28 08:06:43 +00:00
Orgad Shaneh
ac9ad08f67 Gerrit: Factor out remote server chooser
Preparing for re-use in Push to Gerrit dialog.

Task-number: QTCREATORBUG-16367
Change-Id: Ic72f72024d6b6b5a525f6855a9947d4c2dc6de48
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-28 07:27:38 +00:00
hjk
345680a159 QmlProfiler: De-pimpl QmlProfilerViewManager
The change is purely mechanical. QmlProfilerViewManager
is an internal class, not even extra #includes are needed.

Change-Id: Ia28b3a90c8c7dfeb1eb2510b4030c566bc264a46
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-27 15:02:49 +00:00
Christian Stenger
a72b38b8c9 AutoTest: Improve finding executables for cmake based projects
Depending on the structure of a project we might end up inside a
library and will not find the correct executable for running a
test. This patch improves finding the correct executable, but
depending on the complexity of the project it will not be able
to fix all circumstances.

Task-number: QTCREATORBUG-17882
Change-Id: I847bb40426bc1b874c2dc6a2a6880b11fe048bda
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-27 13:14:12 +00:00
hjk
acd50cea8b Debugger: Provide Alt-V + some letter short cuts to enable views
This kind of conflicts with the Alt-V + [0-9V] FakeVim short cuts,
but since those are rarely used and still operational in edit mode
I think that's acceptable.

Change-Id: If232cc6574690e0219eddcaa89d844f498687b64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-27 13:10:52 +00:00
Eike Ziller
90690fbc8e Qbs: Remove unused member
Change-Id: I076ce22ff2cf18732da4ffbc32fe5dbfff6b7fdd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-27 12:28:34 +00:00
Orgad Shaneh
5ee1030791 Gerrit: Workaround gerrit issue when origin has /p prefix
/p was used with older versions of gerrit. It is no longer required, but
still supported.

Change-Id: Ie7c6a941031c56cf805c13518deec0fadb2f69ab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-27 11:47:12 +00:00
hjk
b18f9db8d7 ProjectExplorer: Rename RunWorker::displayName to Id
... and remove getter. It's only a debugging aid.

Change-Id: I760dcddbfa1a5669c545ed8e9552381031836bd0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-27 11:46:39 +00:00
hjk
06014fb56f Ios: Re-enable QmlProfiler
Change-Id: I55a102c8f3a0c748b483a2fa36aa51947d13764a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-27 08:52:08 +00:00
hjk
38b4dec764 QmlProfiler: Re-organize local run
Having the overall runworker setup closer to the general pattern
allows to re-use SimpleTargetRunner.

Change-Id: Iff151cbebaa6ae6615b933f4277b0581a43d7f7f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-27 08:33:00 +00:00
Orgad Shaneh
f53a07953f Gerrit: Avoid double refresh when opened for the first time
Change-Id: I05e50b22b6b368c655902b90585f770a332f53d3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-27 06:39:28 +00:00
David Schulz
1d57a7e566 TextEditor: Fix updating TextMark priority
Change-Id: Ie88b75507faf1f467b4e044f2b06e25aae32bdcf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-27 04:40:20 +00:00
Jake Petroules
829bf2b9e6 Qbs: move both Qbs settings pages into a single page in Build & Run
Now all build system settings (qmake, CMake, Qbs) are in the same place.

Change-Id: I006168de6ebb1a93b141e81f00788fa7097ab6fd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-26 17:44:56 +00:00
Tim Jenssen
56db0df2e6 Qbs: Fix crash when renaming files
Fix a crash when using file nodes to change the project. The methods used
to take const references, with the data living in the nodes of the project
tree. Since the methods change the project tree and thus cause the tree to
be rebuilt, the original data may get lost. So copy the data instead.

All the qbs::*Data classes are using shared data, so the overhead is not
too big.

Task-number: QTCREATORBUG-18440
Change-Id: I45ca5403a04e17790416dfe15b836f12c732e824
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-26 14:13:07 +00:00
Christian Stenger
6ab1da8b78 AutoTest: Fix finding runconfig for multiple build targets
As we are still constructing build system target to compare with
on the test runner's side instead of getting the complete
information from the run configuration we ended up using the wrong
one in several circumstances. Avoid this by using the executable
information we already got.

Task-number: QTCREATORBUG-17783
Change-Id: I40431bef228f7070109297873c472fea410dbd16
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-26 13:34:16 +00:00
Vikas Pachdha
c95c1857df iOS: Fix standalone QML debugging
Wait for ports before connecting to QML server.

Change-Id: Id2cc1928ddd90c61b84ffed5bdeffeb70f15b8c6
Reviewed-by: hjk <hjk@qt.io>
2017-06-26 12:46:03 +00:00
hjk
ac2f8cd10a BareMetal: Force use of a separate RunWorker in StartupOnNetwork mode
This insures the server runs before gdb starts up and tries to
connect.

Change-Id: Idd4863d32f8c0e25bbbec6bdd4e52b8576fc1b6a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-26 09:07:20 +00:00
hjk
fa43f5e314 Valgrind: Add a ValgrindRunner member to the ValgrindToolRunner base
... instead of having one in each derived class.

Change-Id: Icd121ce46b1d161bd2d59eaeaad8363528dc3c23
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-26 09:06:57 +00:00
Christian Kandeler
b884f5c481 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: I78de243f6a383f08b29e4a4807092c4f003d55ad
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-06-26 08:04:44 +00:00
Orgad Shaneh
ecf308ee43 Merge "Merge remote-tracking branch 'origin/4.3'" 2017-06-26 07:43:23 +00:00
Thomas Hartmann
681d60143f QmlDesigner: Be more specific with overriding shortcuts
We have to be less aggressive when ovveriden keys, so that
shortcuts like strg+shift+up/down still work.

Task-number: QTCREATORBUG-18361
Change-Id: I2f4819f627f8820533b603575e853aec7d91171d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-26 07:12:23 +00:00
Marco Benelli
2123aebf65 QmlJS: keep track of cursor position in reformatting
Task-number: QTCREATORBUG-18416
Change-Id: I30c07e0bff1b3f3933ff0e4aee8f1f2c81bd5ef6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-06-26 07:09:48 +00:00
Friedemann Kleint
eadd033fb9 EnvironmentItem: Introduce operation enumeration
Extend operations to handle prepend/append which can be optionally
determined by diff(). This allows cleanly implementing
the MSVC toolchain setup.

Amends c7a84634fd

Change-Id: Ida08d8f5e00cf5f78c20ea8d08c531b1ed22c015
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-26 06:40:50 +00:00
Orgad Shaneh
5f973de952 Merge remote-tracking branch 'origin/4.3'
Change-Id: Ib5405ed2c3356f65b49fe2f454f8ac2e0de44ef6
2017-06-26 08:24:26 +03:00
Orgad Shaneh
59a0aeb739 Git: Fix and add accelerators in branches dialog
Change-Id: I5a3d1d2b8fe4f97635e12ff946187c5fb5207a43
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-25 18:17:37 +00:00
Orgad Shaneh
85a971fae1 Git: Remove unused setting
Change-Id: I0c5888fbbcf2302eb6db128ea3c6603751afa612
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-25 18:17:08 +00:00
Jake Petroules
e3285ce85d Auto-detect CMake in standard paths on Windows and macOS
Change-Id: I8ae765eaed5bc234347e01fe81c208b77c1c32ec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-23 17:41:13 +00:00
Jake Petroules
7ff48935e8 Explicitly specify the minimum macOS version in the qtcjson library
Also don't set the value in more than one place.

Change-Id: Iea1dc1d4e127c12d6333799dda91749eb2d604d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-23 17:28:58 +00:00
Tobias Hunger
29cf39bfd6 ProjectExplorer: Fix crash in AppOutputPane
The RunControl owns the Formatter set on the OutputWindow. Make
sure the OutputWindow is deleted before the RunControl and avoid
some useless setting of the Formatter.

Task-number: QTCREATORBUG-18428
Change-Id: I40c8f032bb04c484957a35a6bbc0fda7b6491c51
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-23 14:22:08 +00:00
Eike Ziller
e133ee8928 Separate locator input widget from result list & popup
The input field may not care whether the result list is actually in a
popup or not.

Change-Id: Ia15f9a32441243de458e4e55d2daef6204b9dd59
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-23 13:38:07 +00:00
hjk
3a45d763ca Debugger: Remove DebuggerStartParameters::connParams
It's nowadays a duplicate of a subset of what DSP::remoteChannel
provides.

Change-Id: I95363bd392cb1d24fb1f1e0a2780c2c295929cea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-23 13:09:04 +00:00
hjk
e797f41759 RemoteLinux: Prepare for downstream Qdb adaptations
Change-Id: Ie00eb97cd0aeaf8eac193ead3048c180fe39808e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-23 12:43:09 +00:00
Przemyslaw Gorszkowski
c6771c39c1 CppEditor: Fix quickfix for adding include for static functions
Task-number: QTCREATORBUG-14499
Change-Id: Id3e962ed310f43c33b91c7834a1f9ca074519a38
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-23 11:47:24 +00:00
Eike Ziller
a9eb1d39c8 Locator: Reduce interdependency between item list and input field
By not getting the currently selected row at arbitrary times.
This introduces a slight behavior change for an improbable edge case,
which could be viewed as an improvement:
If there are multiple filters active, and the first, higher priority one
could finished much faster than the second, lower priority one, the
following sequence

Wait for results from first filter
Press return
Move up or down
Second filter finishes/cancels

without this patch did not select the item where you pressed return, but
the item that was selected when the second filter finished.

Change-Id: Iba2c72e2494824de961782ba3fe0bb1041072614
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-23 11:36:12 +00:00
hjk
fc8dee4675 Valgrind: Make the (threaded) parser a proper member of the runner
Simplifies user code, and it was only ever used in a 1:1 relation,
even in the tests.

Change-Id: I3ce4fc83a361aceb730c05420efdb4ea52d37cda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-23 11:30:32 +00:00
Ivan Donchevskii
7edd5876a5 MsvcToolchain: Fix wchar_t warnings for C files
For pure C compilation we do not need _WCHAR_T_DEFINED
flag.

Task-number: QTCREATORBUG-17235
Change-Id: I05fb04622056a19581cf45ac9a707864cd1cdf8f
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-23 10:18:55 +00:00
Tobias Hunger
95e277d31a ProgressManager: Simplify code in ProgressBar
Use member initialization, remove unnecessary destructor, remove QLatin1*

Change-Id: I116fdd7439b30c51e672402789382f2265543345
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-23 10:17:51 +00:00
Tobias Hunger
64c5f960e8 CMake: Return an empty project tree if parsing failed
This triggers the logic in Project to show the top level project
file in the project tree.

Remove similar logic in CMake.

Change-Id: I2bfdd3f5e3d4126910a3feb480cec5ef689954ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
2017-06-23 09:56:07 +00:00
hjk
88fd4043d8 Valgrind: Merge MemCheckRunner and ValgrindRunner base
It's mostly the xml/log handling, which can be re-used in other tools.

The change is purely mechanical, including some style fixes and
some modernization.

Change-Id: I6b44ae71451e8d3e26df40b9af9b4ec70038a92d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-23 09:41:28 +00:00
Thomas Hartmann
7062fd5138 QmlDesigner: Avoid accidentally changing gradients
The designer was changing gradient stops if the item "selected"
in the edit mode has a gradient. The first gradient stop was set to white.
There is still an issue with setting up the gradient editor in this case,
but the file is not changed anymore.

Task-number: QTCREATORBUG-18421
Change-Id: Ifd6829590a8a7b5217c53f49054f8738bdb71563
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-23 08:52:36 +00:00
Alexander Drozdov
1acd9d30dc BareMetal: fix Run configuration
Run configuration is broken for remote GDB and hardware debuggers:
just first target can be handled for project.

Task-number: QTCREATORBUG-18434
Change-Id: I3fcff2d906f377dd5a161f74d2c6b21bc5ab943f
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2017-06-23 06:28:24 +00:00
David Schulz
7293c01210 Debugger: Fix inappropriate debugger warning when using mixed debugging
Change-Id: I3fb1818e36d01f69cca6ad07653afdc49bda702e
Reviewed-by: hjk <hjk@qt.io>
2017-06-23 05:25:54 +00:00
hjk
ffc97df7a6 Debugger: Remove remote setup sub-statemachinery
Not needed anymore in the world of RunWorkers.

Change-Id: Id7fb24fece6acb03de12f2677dd99a05c513e7a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-22 12:28:08 +00:00
Thomas Hartmann
2e128db77f QmlDesigner: Use ";" as delimiter for QMLDESIGNER_RC_PATHS
This is what is used in the qml2puppet.

Change-Id: I5c9ce65863539395d0f2c56e7be89998fd26f341
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-22 12:01:57 +00:00
hjk
b1e23b7121 Revert "Make the output window readonly, but still keyboard friendly"
This reverts commit 3080d0d9e7.

Having the output pane editable is considered a feature by some as
it allows easy modification of the contents before passing into
other, less accessible interfaces, like Gerrit comment fields.

Task-number: QTCREATORBUG-18418
Change-Id: Ice0c6c5e5787d242c714a7b0f61559a70d25d243
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-22 11:03:19 +00:00
hjk
107df0a7c1 BareMetal: Remove last uses of the remote setup sub-statemachinery
Change-Id: I295f1fda6dc82c74769bc78f2074480b83dd7a0a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 10:13:59 +00:00
hjk
4ecb1283fe Debugger: Do not crash in (im)possible situations
Task-number: QTCREATORBUG-18427
Change-Id: I800c2f8d4ea37b28022d789a2e519e4f5286f08a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-22 09:37:37 +00:00
David Schulz
4322990926 Editor: Simplify text marks
Moving defaultToolTip and color from TextMarkRegistry to TextMark.
Allowing every instance of a TextMark object to define these
information.

Change-Id: Iec1794372cf902b34d343402074e3999e7f9faf7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 08:42:40 +00:00
hjk
fe3facb015 Valgrind: Dissolve CallGrindRunner
Basically merge with CallGrindToolRunner, to which there was
a 1:1 relationship.

Change-Id: Iebd9325c36e82b966f873d380395065e087958e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 08:42:34 +00:00
hjk
acc9da0861 Valgrind: Merge MemCheck{,WithGdb}ToolRunner
Change-Id: Iaf0707cf5c06ef29c33da835133948256869c76a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 08:38:17 +00:00