aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Utils: add has_value to optionalDavid Schulz2018-05-161-1/+3
| | | | | Change-Id: I73af682c98d3fd9e97c169ffb3930950e2b0addb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge "Merge remote-tracking branch 'origin/4.7'"Eike Ziller2018-05-1613-14/+72
|\
| * Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-05-1613-14/+72
| |\ | | | | | | | | | Change-Id: I0ef2f6ac30fb0c020e0f59d2a014d0dd3bab7d81
| | * Merge remote-tracking branch 'origin/4.6' into 4.7Eike Ziller2018-05-167-5/+33
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qnx/qnxplugin.cpp Change-Id: I8ede5fa9c8daf3001e41fcba7cbee68edb9db3a6
| | | * Android: Fix the android include pathVikas Pachdha2018-05-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-20340 Change-Id: Ie1d7c15bf8b38b5141868149684e026ba9666630 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
| | | * QML Debugger: Don't hang if there are no scopes to be retrievedUlf Hermann2018-05-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.11.0 contains an optimization that does away with call contexts for simple inline bindings. Also, it doesn't report QML contexts as scopes in the "frame" and "backtrace" commands. Therefore, in those cases "this" is the only thing to be retrieved. Check if we are done when "this" has been retrieved and no scopes have been found. Change-Id: I9e0f545777bc38333938b65a934d42701ec4f807 Task-number: QTBUG-68218 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
| | | * Qnx: Fix persisting of deploy stepshjk2018-05-153-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the deploy steps re-used from RemoteLinux were created ok when creating a new QnxDeployConfiguration, they did not survive a restart (or rather a toMap/fromMap cycle, as the restoring insisted on having a RemoteLinuxDeployConfiguration). Since sharing DeployConfiguration*Factory*s is not yet possible, this patch here creates additional DeployConfigurationFactories creating the same steps, but insisting on a QnxDeployConfiguration parent. Task-number: QTCREATORBUG-20248 Change-Id: I70666f79993a1332cd1959ab5e3665797d2401ca Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * | iOS: Fix incorrect device type in run configurationVikas Pachdha2018-05-162-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-20413 Change-Id: I5b96273161401e83567da80770f0f1c3482b7311 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * | QmlDesigner: Disable shortcut if document did not changeThomas Hartmann2018-05-151-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I95f67379d507ab599d2435cc042f96fc28d8d7cd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| | * | Valgrind: Add clear button to callgrind toolChristian Stenger2018-05-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callgrind runs can spread TextMarks across files. Only way to get rid of them would be to start a new analyze and stop it before it can add new TextMarks. Be user-friendly and allow clearing the data including the TextMarks explicitly. Change-Id: If8d5c5f789414709a110249377ce907466c0fdf1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: hjk <hjk@qt.io>
| | * | QtOutputFormatter: Handle QML output with bracesAndre Hartmann2018-05-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example the function f: function f() { console.assert(false, "console.assert() did not pass"); } gives the following output: console.assert() did not pass f (qrc:/main.qml:19) onClicked (qrc:/main.qml:14) which was not handled correctly previously because of the closing brace. Task-number: QTCREATORBUG-20406 Change-Id: I0d63393027cfdb72629007bd9b273b5bb83d392f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * | QbsProjectManager: Fix the "Enable QML debugging" checkboxChristian Kandeler2018-05-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once it was enabled, the value passed to qbs would never get reset. Task-number: QTCREATORBUG-20377 Change-Id: I366cba77ef56d81dcdaf619c697c60396eeec651 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Android: Pass RunWorker to AndroidRunnerWorkerhjk2018-05-163-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RunWorker will carry the amPreStart/amPostFinish commands later, and the run control is still accessible via worker->runControl(). Change-Id: Ieac1a1d2a5a8689025a7707b218df44ef2485b16 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | | | Android: Remove AndroidRunnable::amStartExtraArgshjk2018-05-164-9/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | It was only set up in AndroidRunner from the run configuration and passed to AndroidRunnerWorker, instead get in in the AndroidRunnerWorker from the run configuration directly. Change-Id: I52fc793f07ca766a80a1b06f216f850da0b563ed Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | | ClangTools: Make diagnostic config combo box use full widthNikolai Kosjar2018-05-161-1/+1
| | | | | | | | | | | | | | | Change-Id: Id3cca8f93e9abe74ce959d8c443cbb8840ba5866 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | CppTools: Remove unused functionNikolai Kosjar2018-05-162-6/+0
| | | | | | | | | | | | | | | Change-Id: Ida0def5702bf17551f6e51e2715cee36c768683e Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | ClangTools: Remove outdated TODONikolai Kosjar2018-05-161-1/+0
| | | | | | | | | | | | | | | Change-Id: I7c95c80147b948293bbd9484a4252323ab98dd2d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | ClangTools: Allow applying fixitsNikolai Kosjar2018-05-1610-25/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new column to the view that allows to check diagnostics with fixits. The checked fixits can then be applied with the also new "Apply Fixits" button in the toolbar. Some corner cases are not yet handled: * File is open in editor * File changed in the mean time Change-Id: I3d3f353a4150699a0d082f2a4348e331a4213bcf Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | CPlusPlus: Fix some crashhjk2018-05-161-0/+3
| | | | | | | | | | | | | | | Change-Id: I8b98d86e7d5321e2420d388abba159474d7ad799 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | | AutoTest: Add action to run all tests from current fileSergey Morozov2018-05-1519-2/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | Run specific test functions since one test case can be implemented in multiple files. Task-number: QTCREATORBUG-20329 Change-Id: I07f435c264f18e9608caa5b7ee20dff2d33ee9c0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | CppTools: Allow filtering issues with line editNikolai Kosjar2018-05-153-1/+24
| | | | | | | | | | | | | | | | | | | | | ...matching diagnostic text/description. Child items are excluded. Change-Id: Ie7c50af59e0836f60b2ca3bbe50b11eb19398c61 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | Android: Remove AndroidRunnable::intentNamehjk2018-05-154-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | It was only uses to pass the intent from the Runner to the RunnerWorker, use a normal stand-alone QString member and setter instead. Change-Id: I0fde87b0177d4ed013f9599600929070362ea09c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Android: Remove AndroidRunnable::environment()hjk2018-05-151-2/+0
| | | | | | | | | | | | | | | | | | | | | Not used. Change-Id: I7741f9ddb22ec472cfd31762e54832fae10db659 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | AutoTest: Prevent possible nullptr accessDavid Schulz2018-05-152-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | ... by making sure TestConfiguration::outputReader always return a valid output reader. Change-Id: I6606b1fcfb632d0fb9a68dc0b4a149f74f539100 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | ClangTools: Allow selecting diagnostic config for projectNikolai Kosjar2018-05-1512-25/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting the Clazy/Tidy tool, allow to select the diagnostic configuration for the run. As a side effect, fix a race condition where the runner could end up with no diagnostic config (removed during run) - copy the diagnostic config instead of referencing/querying it by the id. Change-Id: Iedafa8f31a3bbd233d65818fe8de16add1e4d443 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | Tracing: Untangle some includesUlf Hermann2018-05-155-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Forward declare in the header and include in the implementation where possible. Change-Id: Iea54f52fbf1deecab5f5a257821cd6383cf69a91 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | | AutoTest: Fix construction of results treeChristian Stenger2018-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Set an appropriate identifier for the output reader to ensure that children are correctly appended to their parents. Change-Id: Id51c16fdd2e50e1ba11d7fbd1f7abbef386bdae0 Reviewed-by: David Schulz <david.schulz@qt.io>
* | | AutoTest: Rename results executableChristian Stenger2018-05-1513-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename member to better reflect its meaning. It is used as an identifier and might be something else than an executable. Change-Id: I082e3caaa3d94fcd7ab26ebc43bb0eb6da136d57 Reviewed-by: David Schulz <david.schulz@qt.io>
* | | ProjectExplorer: Create a RunWorkerFactory classhjk2018-05-142-36/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | This paddles back a bit on the RunWorker creation setup mainly to get a more flexible setup when it comes to share RunWorkers between different setups. Change-Id: I263742cb1df3689f133a2f6f948ed59a2a52d383 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | | QmlDesigner: Use a less expensive QColor constructorAlessandro Portale2018-05-144-6/+6
| | | | | | | | | | | | | | | Change-Id: Ib49bd177cc8106c3995401e93f816a4ec052b4e7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Clang: Enable Clazy fix-itsIvan Donchevskii2018-05-142-0/+4
| | | | | | | | | | | | | | | | | | | | | Only extra command-line options were required. Change-Id: Id67b0cb29db4539ebec7facd07b53942f5900099 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | | Utils: Fix manual usage of PathChooserChristian Stenger2018-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When manually typing inside a PathChooser that expects an existing command it was no more possible to type a trailing slash without tricking the PathChooser. Change-Id: Ie30e7b0de030f4a3d64fce89ed799c03a594261d Reviewed-by: hjk <hjk@qt.io>
* | | ExtensionSystem: Forward setEnabledBySettings to PluginSpecIvan Donchevskii2018-05-142-0/+7
| | | | | | | | | | | | | | | | | | | | | Private part of PluginSpec is not accessible from plugins. Change-Id: Id5b8099777b58895b37b5a57c65ecc11a5228143 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Clang: Do not flash issues pane when switching editorNikolai Kosjar2018-05-145-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when swichting to a file with errors, the Issues pane button would flash. Stop this for the clang code model issues as it is rather annoying since the issues pane is updated for the current document. Change-Id: I403a8b8cd0deef586c53769d0b646855a7fc9278 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | | Clang: Improve diagnostic tooltips for tidy/clazyNikolai Kosjar2018-05-141-7/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the header for tidy/clazy issues showing "Clang-Tidy Issue" / "Clazy Issue" and the option that led to the warning, as for normal clang diagnostics. Having that, chop off the option in the text to avoid redundancy. Change-Id: I30a87dc739faa38c51d9e1fb5b9dfc7ffb7055c5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | | CppTools: Merge diagnostic selection widgets togetherIvan Donchevskii2018-05-1410-175/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | QComboBox, QLabel and QPushButton are always used together. Therefore it makes sense to put them in one custom widget. Change-Id: Ie21675530fbadd7071f2a362567dadb6f09bb68d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | | Clang: Reduce diagnostic visualization for non-project files furtherNikolai Kosjar2018-05-144-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already avoided showing inline annotations for diagnostics in non-project files. But given many diagnostics the visualization is still quite noisy. E.g. consider opening not self-contained header files or files for which we do not have any project open, as it can happen if the debugger jumps to such a file. So leave only the text mark icon on the left and avoid all the rest: underlines and refactoring icons in the editor, marks in the scrollbar and task hub issues. Change-Id: I05245981b21b38be650489a006593922dcb6896d Reviewed-by: David Schulz <david.schulz@qt.io>
* | | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-05-1411-20/+54
|\| | | | | | | | | | | Change-Id: I9d433fa6ce4f60a2acfbdb21da9f727cac8d7526
| * | Merge remote-tracking branch 'origin/4.6' into 4.7Eike Ziller2018-05-147-14/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18
| | * Debugger: Try harder to find a usable devicehjk2018-05-113-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In remote setups without proper run configuration (e.g. attach using the menu) there was no device available. In some situation there's access to a kit, though, containing the right device. Use it. Task-number: QTCREATORBUG-20331 Change-Id: I54523f71fc10c9959901f36f3d62872d139279e5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * ClangStaticAnalyzer: Use --driver-mode=cl to support MSVC flagsIvan Donchevskii2018-05-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | we do not use clang-cl anymore but we can use this flag to turn on the clang support of MSVC flags. Change-Id: I1aefc4c0c2324a8f6ce77d93a488126ce8bb0253 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| | * CppTools: Rollback some changes in CompilerOptionsBuilderIvan Donchevskii2018-05-032-7/+8
| | | | | | | | | | | | | | | | | | | | | Make it safer in the 4.6 release. Change-Id: I75857ecc08af8febe40fd75dc94d8ab986d4b768 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| | * CppTools: Fix MSVC toolchain flags for C-filesIvan Donchevskii2018-05-033-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of C-header or C-source files the MSVC language version was not switched to C. Fixes static analyzer runs for C files. Task-number: QTCREATORBUG-20198 Change-Id: I1da31a1048b7c258642cf00f5084681f5d384ee6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * VCS locator filters: Let locator close its popupEike Ziller2018-05-022-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By delaying the execution of the action with a singleShot. Both CommandLocator filters and the menu bar filter are affected. Task-number: QTCREATORBUG-18863 Change-Id: I4f3d39410621c2d578bc9f7af7357af372a15b73 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * | QbsProjectManager: Don't turn on QML debugging in release modeChristian Kandeler2018-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | By default, that setting should not be enabled in release mode. That's also how the QmakeProjectManager behaves. Change-Id: Ifc5ed93b37b3f3f13ee19c5072f327794ea88144 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | QmlDesigner: Remove outdated Qt version conditionsOrgad Shaneh2018-05-112-4/+0
| | | | | | | | | | | | | | | Change-Id: I7fa3147afbdc07814f8710a44140072e7bbd8511 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlProfiler: Fix implicit fall-throughOrgad Shaneh2018-05-111-2/+1
| | | | | | | | | | | | | | | | | | | | | Detected by GCC8. Change-Id: I59d55322eaef631163a56b619ffbf09671758caa Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | CppTools: Change QComboBox in diagnostic settings to QListWidgetIvan Donchevskii2018-05-142-36/+40
| | | | | | | | | | | | | | | | | | | | | | | | ComboBox gives an impression of selecting one of the entries which is not the case for this widget. Change-Id: I83f94def7553d4ceaec5ba957765f4494dc3d610 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | | ClangTools: Use separate diagnostic settings for ClangToolsIvan Donchevskii2018-05-145-13/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | Share diagnostic configuration profiles between ClangTools and ClangCodeModel but keep the unique configuration index for each of them. Change-Id: I86d95f7f220e929d60a53f3633167adfcd62a2da Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | | CppTools: Split diagnostic settings and selectionIvan Donchevskii2018-05-1414-148/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now selection is only consists of combobox and a "Manage" button to diagnostic configurations. Diagnostic configurations are moved to the modal dialog which is shown by clicking the mentioned "Manage" button. Change-Id: I607fb923c97e8730448548708f3aaf32ce1983c8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 00:35:27 +0000