Commit Graph

44349 Commits

Author SHA1 Message Date
hjk
71c612d07d QmlProfiler: Add display name to LocalQmlProfilerSupport
For debugging purposes.

Change-Id: I6e8006983e30c928ad4cf69f15e627f23741e99d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-19 16:01:22 +00:00
Thomas Hartmann
9c2f2bed3a QmlDesigner: Refine selection
This is a major overhaul of the slection logic.
We do not change to the move tool automatically once
the curser enters the selected item. This allows selection
of items that are at the same position as the current selected item.

The selected item can still be moved if there is no pissible candidate for
selection. Also the border and gizmo always allows an item to be moved, if
the item is fully covered by another item.

Change-Id: Ic97a2bf23f33fcc5e209248aeb2f97df67bd23e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-19 12:16:41 +00:00
Marco Bubke
48b17e341c Utils: Use replace instead of transform
Change-Id: I7399308b93280d1150a24e5729aefc60e1826ea6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-19 11:24:54 +00:00
Marco Bubke
d6d89e3859 Clang: Disable LLVM depend tools if there are no LibToolings libs
Change-Id: Ib30889d75e26916fe02ef10de9f9a20eb8eb893e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:24:35 +00:00
Orgad Shaneh
240d2dc4d4 Git: Fix initial button enabling in Branches dialog
Change-Id: Iad99dd1468457b8de262ee16c4182ac9ff82e0b8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:15:53 +00:00
Robert Loehning
da904f69f7 QMake project manager: Fix typo
Task-number: QTCREATORBUG-18585
Change-Id: Ia9dccc1f9c19f393ad833c6ffa79ecef824981f1
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:03:30 +00:00
Tim Jenssen
fd5b5fc26f ProjectExplorer: fix warning about casting something to bool
Change-Id: I258a4a2d0a89cd28d6196b8d79a78b94cfc9553c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:03:08 +00:00
Marco Bubke
b9b69bac33 TextEditor: Disconnect highlighting from text editor content changes
The syntax highligher is connected to the content changes of the text
editor which is not very useful if the diagnostics been provided by
an asynchronous mechanism. So we add a setter to disconnect the changes
from the syntax highlighter.

Change-Id: Ied4b5fe34000b13bafb1aa177b89befe6620d4d7
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-19 09:25:40 +00:00
Tim Jenssen
2f0a395017 Wizards: make get widget a bit more robust
Change-Id: I0182147f517a39c3fdb0f27be4354b30e2cc4f31
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 09:14:49 +00:00
Tim Jenssen
bfe50832b5 QmlDesigner: Fix crash
Change-Id: Ic6c1b8aae4f7bfe77aabaa6d55f04ef2730c7f4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-19 09:02:34 +00:00
Eike Ziller
71b78e1085 Help: Remove workaround for fixed Qt bug
QTBUG-26593 is fixed since Qt 5.3.2. The bug lead to e.g. the mouse
cursor not changing it's shape when hovering over links.

Change-Id: Ib8d2188cbbe87592217f4159286f38bc1c6f2b28
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-19 08:03:08 +00:00
Claus Steuer
d105ac8255 CMake: Fix "CMake configuration changed on disk" dialog
The dialog is shown when the cmake configuration changes.
The user can either apply the changes or reject them. To determine the
decision of the user the return value of the dialog is evaluated.
This is wrong because the dialog uses custom buttons (see documentation
of QMessageBox::exec). As a consequence the configuration is never
applied.

Use QMessageBox::clickedButton to determine the user decision.
Additionally change the role of the apply button from AcceptRole to
ApplyRole as this better matches its intention.

Change-Id: I1d2d1fb7186dcc8d789c192c51bb34111eb84ee5
Task-number: QTCREATORBUG-18292
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 04:31:02 +00:00
Claus Steuer
9916c0a759 CMake: Do not check for changes if config was changed by the user
When the cmake configuration changes, BuildDirManager checks whether
the new configuration differs from the current configuration.
In case of differences a dialog is opened and the user must decide if
the changes shall be applied or rejected.
When the user changes the cmake configuration in the projects page the
dialog will open as well. This is unencessary since the user already
decided to apply the changes.

Let BuildDirManager not check for changes if the configuration was
changed by the user via the projects page.

Change-Id: I736ee7f4dee99fe707f2931c73b287231b1daa1d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 04:30:51 +00:00
Claus Steuer
bf10378992 CMake: Fix cmake config can't be changed by user in tealeaf mode
Changes to the cmake configuration (via projects page) are not applied
in tealeaf mode.
The tealeafreader::parse method passes changed config parameters to
cmake only if the .cpb file does not exist. Since that file always
exists after project initialization the user can't change the cmake
config anymore.

Make tealeaf reader pass changed config parameters to cmake when
a reparse is forced. This restores the behavior from 4.2.2

Change-Id: I31ffad32d176e6290064b55758e4df96d2ffe6bc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 04:30:38 +00:00
Claus Steuer
13bcdf700d CMake: Set project file location in tealeaf mode
The tealeafreader creates a RawProjectPart for each cmake build target.
However, the location of the CMakeLists.txt is not set/added to
RawProjectPart::projectFile and RawProjectPart::buildSystemTarget.
Both properties are required by the AutoTest plugin to map
run configurations to test configurations.

Make tealeafreader use the same code as the servermodereader
to determine the location of the CMakeLists.txt.

Change-Id: Ia35444799bcd3c46f84ad897044cae56c1aa16ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 04:30:19 +00:00
David Schulz
1ebc364349 TextEditor: Jump over braces inserted by the TextDocumentManipulator
Task-number: QTCREATORBUG-16946
Change-Id: I445c5698da59230f1d6ae859e6bbf20d26fc5bb9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-18 21:14:35 +00:00
Alessandro Portale
66f762959e Clean up qtcreatoricons.svg
This removes all the "inkscape:export-*" attributes which are
user specific.

Change-Id: I70cdbb5e1ca1cce63991b2eaa539b80692864ac2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-18 18:02:28 +00:00
Tim Jenssen
4895ea8371 Revert "Wizards: scale smaller icons if necessary"
This reverts commit 1646510ffa.

Had problems at highDPI and is not necessary since we have all
icons in the right size.

Task-number: QTCREATORBUG-18587
Change-Id: I544aa23f29db571cb9920f6ac7d462c2f463e24e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-18 18:01:59 +00:00
Robert Loehning
6d4472d6b4 Valgrind: Init members of CallgrindController
Change-Id: Ic35575858391f98c84ee08cf6287c379a7e866da
Reviewed-by: hjk <hjk@qt.io>
2017-07-18 13:52:35 +00:00
Eike Ziller
361fdad3be Merge remote-tracking branch 'origin/4.4'
Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
2017-07-18 15:23:29 +02:00
hjk
41ae823bda ProjectExplorer: Take run mode *really* into account
Change-Id: Iab69e43a1c6e06dadb5a193d827b7673f09e87c9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-18 13:16:19 +00:00
hjk
b3f13f9620 ProjectExplorer: Move RunWorker priority handling to worker selection
This fixes the temporary regression introduced by 5a848aa1. After
having RunWorker registration in RunControl and RunConfigurationAspect
registration in RunConfiguration, this was effectively the only
remaining code in IRunControlFactory, so this can go now.

Change-Id: I38b51bb00058b90d30f0260660b040f788920008
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-18 11:58:17 +00:00
Tim Jenssen
5e38bdbfd8 Scxml: use qobject_cast instead of static_cast
Change-Id: Ibcaca17a91856f041fcf9f28c8be6bdc2df63fe6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-18 11:51:43 +00:00
Tim Jenssen
1646510ffa Wizards: scale smaller icons if necessary
Change-Id: I26b51668b1f2d1be1b96e43bbc42f49d39249e83
Reviewed-by: hjk <hjk@qt.io>
2017-07-18 09:57:48 +00:00
Alessandro Portale
c77e76dd6d Nim: Update the Nim wizard icon
The icon should have the same size and look as the other icons.

Task-number: QTCREATORBUG-18550
Change-Id: I16ee48196a14878858f02cabe0678342b4abb44f
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-18 08:58:06 +00:00
Tim Jenssen
ca49ff1f87 Wizards: sprinkle some overrides
Change-Id: I52bd759f9c91f36192b147a1e6579be2b4b54a82
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-18 08:17:16 +00:00
Tim Jenssen
dbb67fd5c3 Wizards: remove empty line and replace tabs with spaces
Change-Id: I5decd680f92ee78a036be894aee42226b73dd053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-18 08:16:51 +00:00
Tobias Hunger
98764a44a7 qmake: Fix WS
Change-Id: Ib87bdf6c686e3bb37bdd55955d5e18de79d2729a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-18 08:05:07 +00:00
hjk
c5cc3e2594 ClangStaticAnalyzer: Don't get stuck if project is not buildable
Task-number: QTCREATORBUG-18495
Change-Id: I6621ceebd05be2fabcdcd3061e41e4674e5fbb26
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-18 07:52:21 +00:00
hjk
ba7f7bcf0f ClangStaticAnalyzer: Remove a few + QLatinChar('\n')
It's implicit in appendMessage nowadays.

Change-Id: I4f1bdde4d4127579d4b26cd275def59c65f18f2f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-18 07:35:30 +00:00
hjk
3b22cd3e20 Debugger: Describe the "Override server address/channel" field better
Change-Id: I2bd112d1d2f46904513fa668a17f0a07ebe26e12
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2017-07-18 06:57:03 +00:00
David Schulz
862dd4c6bf TextEditor: Simplify annotation rectangle computation
Change-Id: Ie04f545d24696d66645c367b2c25d643c3691908
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-18 06:53:30 +00:00
David Schulz
a196170df9 Debugger: Fix removing items from modules model
Change-Id: Icce09b890e9a4a5cca142ee5307fd6f42bd5c839
Reviewed-by: hjk <hjk@qt.io>
2017-07-18 06:53:19 +00:00
Tobias Hunger
93bc0a9ada Utils: Explicitly include export macro in PersistentSettings
Change-Id: I6734da09919df0669e7715cd362455d6e21cb04b
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-17 14:39:05 +00:00
Orgad Shaneh
7fd827e762 GCC: Auto-detect also cross-compilers on linux
Change-Id: I925980d2b345a9f9e3ff11f369938eb8d216f1d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-17 14:31:15 +00:00
Orgad Shaneh
7f4696235b GCC: Use right language on macro detection
Change-Id: I9522b58cddcb9f3c67331d3bbf5518472648eed8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-17 14:29:40 +00:00
Orgad Shaneh
eebac87be5 ProjectTree: Enable Synchronize with Editor by default
Changed by 4943510b60.

Change-Id: I359c4abd77009b22bc1a7143002563f66a3b5fd0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-17 14:28:30 +00:00
hjk
528b0918bf ProjectExplorer: Remove RunControl::bringApplicationToForeground
... and replace it by direct uses of ProcessHandle::activate().

Change-Id: I7beffba7bfbeff72a81b8699ff54a311a74ce1a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-17 14:00:49 +00:00
hjk
d93da5f5f1 ProjectExplorer: Add and use a RunConfiguration::registerAspect<>
... to register RunConfigurationAspect creating functions.

Change-Id: I9e7a2cef0bc134ac6a7becbd0b5ecb40c26ef118
Reviewed-by: hjk <hjk@qt.io>
2017-07-17 14:00:28 +00:00
hjk
b7babda68d iOS: Remove unneeded abortDebugger call
Change-Id: Ib4a4897e61b74cfed54a77b367fcad8932a47b9f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-17 13:37:41 +00:00
hjk
6c04099601 iOS: Dissolve IosRunControlFactory
Follows suite.

Change-Id: I2ef11d19d9a2d3d0f3f282a94f98a40478273fbc
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-17 13:37:25 +00:00
Christian Stenger
cb0a09b74b ProjectExplorer: Fix compile for older gcc/Qt5.6
Change-Id: I145f2fddb143b1e3149b4b850a7586115ac20df6
Reviewed-by: hjk <hjk@qt.io>
2017-07-17 12:44:43 +00:00
hjk
cd5ba75505 ProjectExplorer: Use a real 'finishing' phase for RunControls
Instead of a blunt delete() RunControl::initiateFinish() is triggered
by the closing of the application output instead. The rampdown process
is basically the same as stop() now, except for the other success
signal (new finished()) and the final self-destruction of the
runcontrol.

stop() itself triggers initiateStop() on all running workers in
parallel (before it was in the order of start). This gives
downstream complex worker combinations the flexibility to use any
order it wants by ignoring stop() on 'uninteresting' workers,
and centralizing rampdown e.g. in the main worker. That setup should
be rare in practice, but seems needed in some profiler cases.

Change-Id: I986a152a663754206709ed4df0d4568847afad17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-17 12:28:50 +00:00
hjk
c8054d9547 ProjectExplorer: Heed RunControlFactory priorities again
This fixes the regression introduced in 5a848aa188 and uses the
feature to resolve the conflict between ClangStaticAnalyzer and Boot2Qt.

Change-Id: I6cdec8261a457c399c11a4b2078a78088d4c56d1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-17 12:28:31 +00:00
Eike Ziller
a7e895166f Locator: Fix pressing return when no results are available yet
In that case the first item will be activated as soon as it gets
available. That behavior got lost during the recent refactoring.

Task-number: QTCREATORBUG-18560
Change-Id: Ifda117f92f2adf23b499f50bdb4809c5e7830517
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-17 11:06:09 +00:00
Tim Jenssen
d5342eff77 fix property spelling
Change-Id: I00f84ec8d2c83d7f3937d2e21a24e02ba28991b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-17 10:38:08 +00:00
Jarek Kobus
0b1eaacabb DiffEditor: fix the cancellation of diff requests
Change-Id: I36c4af4ec51473fb9da5d9f099f2251f75b2020a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-17 09:32:28 +00:00
Jochen Becher
942c632e38 ModelEditor: Fix whitespace
Change-Id: Ibed2012a2c24cecdbe2c7ee3be25d6324b7faf69
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-17 09:29:52 +00:00
Nikolai Kosjar
8309e0c56a Clang: Avoid blocking UI if references are requested and clangbackend crashes
The two cases in which the UI might be blocked are:
 * Invocation of the editor context menu
 * Rename Symbol Under Cursor

Cancel the future if the backend is restarted and on the other side,
check whether the future is cancelled.

Change-Id: If2315da1f66f15eab1531fcd8da1dff851a9a4e6
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-17 08:24:08 +00:00
Nikolai Kosjar
db88225b0e CppEditor: Fix invalidating diagnostics on reload
Issue was:
 1. Open some small file without any includes but with diagnostics
 2. Switch to the shell and touch the file open in Qt Creator
 3. Switch back to Qt Creator and confirm reload
  --> Ops, inline diagnostic stays invalidated/gray

This is due to a race condition. The problematic sequence is:

  1. CppEditorDocument::scheduleProcessDocument()
       // OK, because contents changed
  2. ModelManagerSupportClang::onCppDocumentReloadFinishedOnTranslationUnit(bool)
       // OK, because we listen on TextDocument::contentsChangedWithPosition.
       // Because of the fast reparse, new diagnostics are processed with
       // ClangEditorDocumentProcessor::updateCodeWarnings().
  3. CppEditorDocument::processDocument()
       // Timeout, invalidates the already up to date diagnostics

Avoid to trigger the process timer during a reload.

Change-Id: I712d6b2fd5524d5fe6866dbdbb8cbca05e4aef2c
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-17 07:58:33 +00:00