Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
9df86c2e67 Gerrit: Show only gerrit remotes in Push to Gerrit dialog
Task-number: QTCREATORBUG-16367
Change-Id: I18e24dd0748bd64790bd8d2c0eeeee2cf1d3991a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-01 19:37:37 +00:00
Orgad Shaneh
6c70f22ada VCS: Preserve selections in commit editor on refresh
Task-number: QTCREATORBUG-18483
Change-Id: I749f2d4d583f197e7b5b6f69116c3a196e85484b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-01 19:25:35 +00:00
Orgad Shaneh
caaf370660 Gerrit: Store also remote name in remote chooser
Separate name/server data from the combo box.

Task-number: QTCREATORBUG-16367
Change-Id: Ie7bfbe19a07b948f5d170846909092be53e617bd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-01 19:01:45 +00:00
hjk
629c137ef2 ProjectExplorer: Remove virtual RunControl start/stop trampolin
Not needed anymore, effectively replaced by RunWorker start/stop.

Change-Id: I7483c841cdd4e05c9e1f7636a27b20ece37947c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-30 13:32:34 +00:00
David Schulz
ed2d41c5e2 Android: fix compile
Change-Id: I9d3e82db5055ddb1310573eba9353227268dcea3
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-30 13:16:36 +00:00
Eike Ziller
db43aba01e Merge remote-tracking branch 'origin/4.4'
Change-Id: I6791ba0a70724b54b48f8a71e854ce9aad09923e
2017-06-30 15:06:58 +02:00
Vikas Pachdha
a6a13bfb76 Android: Let user specify shell commands
Let user specify list of shell commands to run before app starts
and after app quits.

Change-Id: I9794fb96180530ca6c28ce6581fda51a25be28d4
Reviewed-by: hjk <hjk@qt.io>
2017-06-30 11:56:50 +00:00
Eike Ziller
5a848aa188 Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

This temporarily breaks handling of IRunControlFactory priorities.

Change-Id: Ibbc3c296ac82179f8e627a77436db2ac8fd505a2
2017-06-30 13:50:45 +02:00
Christian Stenger
cc8bff67b3 AutoTest: Support plaintext output for Qt tests
Change-Id: I88ec477777d79c69e699dd906ec4ef1550bcaf44
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-30 11:49:43 +00:00
Christian Stenger
4edc715b1c AutoTest: Speed up finding parent items
We normally add new results to the last added
item, so processing the search for the parent
from bottom to top makes more sense and avoids
iterating over almost every item.

Change-Id: Iede08b9c0d4c80227d2e8fea9b002354f01d5b35
Reviewed-by: hjk <hjk@qt.io>
2017-06-30 11:36:44 +00:00
Orgad Shaneh
f55d3c5c6f Merge remote-tracking branch 'origin/master' into 4.4
Change-Id: I071b3016e11f94c5421822935c13cecda7075f40
2017-06-30 14:22:00 +03:00
hjk
df61f12970 Android: Simplify run control construction
Take advantage of new infrastructure.

Change-Id: If2d2f839b8be1fad2be3b79e21de3c0e475d88cf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-30 10:41:24 +00:00
hjk
04b03f79d9 Valgrind: Use Runnable to pass device information
... in case of "External Application" starts.

Change-Id: I6a5c215831f16c51e3cf98c35dbb792f53128d42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-30 10:34:07 +00:00
hjk
95300f08e3 Valgrind: Keep tool names in the *ToolRunners only
Slightly less convoluted.

Change-Id: I07410b49db05ea862fb82f3bffc25a5d7fb5a104
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-30 10:34:01 +00:00
hjk
8678117572 Valgrind: Merge ValgrindRunner and ValgrindProcess
There was a 1:1 matching remaining.

Change-Id: I619bedcda867b642eab37396a0bd48bcb3a5829a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-30 10:33:51 +00:00
Orgad Shaneh
c9345084c7 C++: Use #pragma once in cplusplus-update-frontend
Change-Id: Ie4821a04706ee55b4ec17cf73356c15c333b3324
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-30 09:15:03 +00:00
Nikolai Kosjar
7a09bb4418 TextEditor: Reduce BaseHoverHandler::identifyMatch() calls
...because they are potentially expensive.

Change-Id: Iaa235ea1fa864a0a67f3ed10b7f89d23179c642b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-30 08:58:07 +00:00
David Schulz
0f7e69034e Bookmark: make bookmarks draggable
Task-number: QTCREATORBUG-9721
Change-Id: I157e2c4a15ae9d7e4942d3be378ecd01ef493155
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-06-30 08:30:21 +00:00
David Schulz
6591a01452 TextEditor: Add line annotations
Displaying short descriptive text of a TextMark at line end.
Currently implemented for ClangTextMark and BookMark.

Change-Id: Idc6b579bda0382ad94b2e236b715696396b10460
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-30 08:27:16 +00:00
Orgad Shaneh
4506acbffc QmakePM: Remove unused signal
Fixes compilation with GCC7.1 and Qt 5.7.1.

Change-Id: Ia902ac1abf65810ee9d86ee0d3fca05717816f3a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-30 06:34:27 +00:00
David Schulz
c9d898ed6d TextEditor: Fix jumping over nested auto inserted characters
Task-number: QTCREATORBUG-16946
Change-Id: Ic652147d76ecc93ff5607b3af733762b0d5c2738
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-30 05:53:26 +00:00
Orgad Shaneh
844f9f47de Git: Move "Include tags" to branches dialog
Change-Id: Icc06dbf8b80a55c3962967c1f37a9c506b8e5bd8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-29 15:51:23 +00:00
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>
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