Commit Graph

54723 Commits

Author SHA1 Message Date
hjk
3418070a4f Valgrind: Remove CallgrindController's use of ValgrindProcess
It's simply one-shot command execution, using (only some part of) the
ValgrindProcess machinery that just happens to also to wrap a process
is conceptually different from ValgrindProcess that "is" the
valgrind-with-debuggee entity (and an unneeded dependency)

Change-Id: I57a2c3d1cab6b15e59cb41b8e131948c170297b6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-29 14:52:46 +00:00
hjk
ef7c633de2 Android: Re-enable QmlProfiler
Change-Id: Icd73475be421e6813b0d496020461e7020b547dd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-29 14:00:22 +00:00
Tim Jenssen
f501c19ebc Wizards: factor out registerFieldName() for later use
Change-Id: Iaca37b246339b1329b7f3364e0686f25615e0e6b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-29 10:40:44 +00:00
Jarek Kobus
bde0f1b0ff DiffEditor: disable saveAs action during reload
Change-Id: I6786139c1cd9c9e3c0786b14da058cb260fba3ed
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-29 10:38:23 +00:00
Christian Stenger
ba1a657227 AutoTest: Make test tree root items checkable
This allows (de)selecting of all test cases of a specific test
framework.

Change-Id: I21357d3dbcfce73387f157b1b40686f437fa260b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-29 10:20:13 +00:00
Nikolai Kosjar
202d4a52a0 Clang: Fix build with QTC_NO_CLANG_LIBTOOLING
...caused by

  commit f5d68398d5
  Clang: Fix canceling of clang query

Change-Id: Ic48485aed1d23e1ddd2f7bc1e37a797d2c2498c6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-29 09:00:07 +00:00
Marco Bubke
1f18848ee7 Clang: Cleanup more PrintTo functions
Change-Id: If1389462479ae10b067904f05cf785c3d8fb9638
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-29 08:58:19 +00:00
Nikolai Kosjar
50790f6187 TextEditor: Avoid unneeded calls in BaseHoverHandler
In checkToolTip(), the call to decorateToolTip() is not needed since it
does not affect the priority.

In showToolTip(), we can assume that checkToolTip() was called and thus
avoid a call to identifyMatch().

TextEditorWidgetPrivate::processTooltipRequest() is the only caller of
checkToolTip() and showToolTip().

Change-Id: I362c697754b6a29c9c0b34f85d3022f00e3e1031
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-29 08:01:35 +00:00
Nikolai Kosjar
a7e8406ced TextEditor: Remove unneeded functions in BaseHoverHandler
Change-Id: Ic61babb48cca0711812256b766f1db62895901f6
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-29 08:01:28 +00:00
Nikolai Kosjar
658e468d80 TextEditor: Clean up BaseHoverHandler
Change-Id: Ie2f0c8c0a46377ae18ff4e31c7e43b1242cb7372
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-29 08:01:21 +00:00
Nikolai Kosjar
3afbd1e5cc De-qobjectify BaseHoverHandler and derivatives
Change-Id: I9bc1d849349f85b5c7fd6013396b8b15b6cb1568
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-29 07:25:15 +00:00
hjk
7bc88000d9 ProjectExplorer: Introduce a Utils::OsType IDevice::osType() function
E.g. for easier construction of command lines in situations like

    if (isLocal())
        runnable.commandLineArguments = argumentString(Utils::HostOsInfo::hostOs());
    else
        runnable.commandLineArguments = argumentString(Utils::OsTypeLinux);

Change-Id: I5a35304e5d1b5a042952201f39f4134a5cd0ce24
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-28 15:49:56 +00:00
hjk
e974f0733e ProjectExplorer: Introduce priorities for RunControlFactories
This can be used by downstream plugins to overrule existing
RunControlFactories.

Change-Id: I23c8e3983827dfa1b5f780664d2e539e908944aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
v4.3.1
2017-06-28 15:39:49 +00:00
hjk
3610b2a825 Valgrind: Fix Memcheck startup on remote linux
Remote CallGrind is still dysfunctional.

Change-Id: Ib9ab537dc068c94c7e61ac48b1a4b9d655ccb60f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-28 15:39:21 +00:00
Nikolai Kosjar
218457786d DiffEditor: Fix build
diffutils.cpp: In function 'QList<DiffEditor::RowData>
    DiffEditor::readLines(QStringRef, bool, bool*, bool*)':
diffutils.cpp:585:53: error: no match for 'operator+' (operand types are
    'QStringRef' and 'const QChar')

Change-Id: I44ad2237c033266d3832ce95174ec056ff7cae9f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-06-28 14:12:00 +00:00
Nikolai Kosjar
70283a9ea6 GLSLEditor: Remove GlslHoverHandler
The BaseHoverHandler does the same job.

Change-Id: I2708a87ed5cbc3b320766f52927be4a9670b522b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-28 13:43:33 +00:00
Nikolai Kosjar
d870bab95c CppEditor: Cancel runner in ~CppUseSelectionsUpdater
...otherwise an already destructed QTextDocument might be accessed in
the ClangCodeModel::Internal::IpcReceiver::references.

Task-number: QTCREATORBUG-18459
Change-Id: I1868b2fd3a64341794f83eea6c4eeb7c2c1af812
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-28 12:35:09 +00:00
Tim Jenssen
22829c1906 Wizards: allow selection of inspect wizard variables dialog
Change-Id: Ibc8085203f2d050de65124b2646628be784103fa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-28 12:02:24 +00:00
Tobias Hunger
543929cd2c CMake: Warn when doing out-of-source builds with in-source configuration
Warn when attempting to do an out-of-source build while an in-source build
is configured. This seems to confuse cmake.

Task-number: QTCREATORBUG-18381
Change-Id: I1abd3be4129ba5af6439dcd60d16d429b93c0382
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-28 11:43:25 +00:00
Tobias Hunger
c0c210cbda CMake: Use tr in BuildStep
Its a QObject, no need for QCoreApplication::translate here.

Change-Id: I3375a70fe60b66e13de6b9a99c35c85f82b9151e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-28 11:43:08 +00:00
Marco Bubke
f5d68398d5 Clang: Fix canceling of clang query
Every AST unit is created and queried asynchronously, like before, but
we don't wait anymore but use a timer to process new sources. So the server
will not be blocked and can process other messages like cancel.

Change-Id: If0e69466c78f628190f59fd32a03cab1c3a4d0a3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-28 09:15:51 +00:00
Vikas Pachdha
a30a18177b Android: Make Android manager activity start arguments configurable
Change-Id: I2e09029e4eb0b8a57fda53efff3d42f109bfe905
Reviewed-by: hjk <hjk@qt.io>
2017-06-28 09:09:32 +00:00
Orgad Shaneh
18fddf8275 Autotest: Fix compilation
Change-Id: I93bb938d7ac90a7fb91b4b6f00833a2b19dc382a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-28 09:09:01 +00:00
hjk
682cd36b15 Valgrind: Remove starting() signal
It's only used internally as one-time communication between
worker and the *Tool singleton that handles toolbar button
states.

We basically start immediately after creation of the worker, so
any pre-start tool bar specific operations can be done at
RunWorker creation time.

Medium term, the runworker should proably steer "their" buttons
more directly.

Change-Id: Id6df703746ece5eebc23507739cd2a92ec55d11d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-28 09:05:43 +00:00
Jarek Kobus
228e4a7542 DiffEditor: refactor loops and const correctness
Change-Id: I21af8db55ff5a012de04b4934de1940babf75058
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-06-28 08:51:36 +00:00
Jarek Kobus
f07fda598e Replace QRegExp with QRegularExpression
Use QStringRef where possible.
Speedup readGitPatch() approximately 2 times.

Change-Id: I7bd09d7ac768331b0600456e48c44cfc72b7001d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-06-28 08:38:50 +00:00
Eike Ziller
e4a6267036 Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/shared/qbs

Change-Id: I521ed7703298062d3860ddce3c82444bedd49e60
2017-06-28 10:28:16 +02:00
Orgad Shaneh
b57372f2b5 Replace include guards with #pragma once
Change-Id: Ic36cf0e9cac61d4d9a7e4434192944f5301b8aaa
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-28 08:07:56 +00:00
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
Eike Ziller
89b3ab7274 Add more changes for 4.3.1
Change-Id: I11e5650fdd77c8eb0fb62beefaad2d9af81e96ed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-06-26 08:59:00 +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