summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Fix defining path to sdktoolv4.7.0-beta1Christian Stenger2018-06-041-1/+4
| | | | | | | | | | | | Replace backslashes with normal slashes as Qt handles them inside paths correctly itself. Otherwise we might end up using unknown escape sequences which leads to not executing anything and a passing test. Escaping the blanks is not necessary as they are handled correctly automatically. Change-Id: Ib1a81949c54d41b7864e30a1371de2e148f96bb8 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Fix possible crash in Projects modeTobias Hunger2018-06-011-3/+4
| | | | | | Change-Id: Ic57dac0487d03d88e0d9d37f67c55ae36e84af4d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Merge "Merge branch '4.6' into 4.7" into 4.7Oswald Buddenhagen2018-06-016-8/+29
|\
| * Merge branch '4.6' into 4.7Oswald Buddenhagen2018-06-016-8/+29
| |\ | | | | | | | | | Change-Id: Ieddac600af64f3b278340c4e3555cee0f4190bcf
| | * qmake: fix file id mapping lifetime management, take 2v4.6.2Oswald Buddenhagen2018-06-014-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out that ref-counting the vfs class is insufficient, as now the ProFile cache (which expires after a timeout) could outlive all VFS instances and thus refer to ids which were discarded and later re-used. to avoid this, we let the cache instance hold a reference to the vfs class. amends d03fb3506. Task-number: QTCREATORBUG-20524 Change-Id: Idd4478ffc1c2405b3b83df32fba45b1f687f6a18 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| | * Tools: Fix architecture detection for wininterruptDavid Schulz2018-05-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the detection relied on the variable CPU which is no longer set current versions of MSVC. Use newly introduced variable VSCMD_ARG_TGT_ARCH (MSVC 2017) or Platform (MSVC 2015) to detect 64bit. Change-Id: I705dbd7d3d7912c36e588a5ff399e65b4ca6f500 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Squish: Update to re-uploaded textRobert Loehning2018-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | This should not expire after another year. Change-Id: I86ed49d491f619509e6bd32fc2624df2a1c24f5f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Doc: Add a question to FAQ about QML imports not being foundLeena Miettinen2018-06-011-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This results in error messages and missing functionality. Change-Id: I041ea8e61f3b4cd113964d2c5dfc609e6581c2f7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | | Doc: Update the FAQLeena Miettinen2018-06-011-67/+61
| | | | | | | | | | | | | | | | | | | | | | | | The Welcome mode is no longer implemented using Qt Quick 2, so the problem arises later, when opening Qt Quick Designer or QML Profiler. Change-Id: Ifbe50bdb9cfc1709842413d271d96378549eb673 Reviewed-by: hjk <hjk@qt.io>
* | | Doc: Update screenshots of Kit optionsLeena Miettinen2018-06-014-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now a top-level category, so the tab order is different from before. Task-number: QTCREATORBUG-20511 Change-Id: I0978dd12f1ea55cb4cb97f2635b9c1ef7b623c5f Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | | Update qbs submoduleChristian Kandeler2018-06-013-3/+4
| | | | | | | | | | | | | | | | | | | | | To HEAD of 1.12 branch. Change-Id: If93ae9f977882a1f0663c93e2aff21511322395f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Doc: Describe "Auto-create build directories" CMake optionLeena Miettinen2018-06-012-2/+5
|/ / | | | | | | | | Change-Id: I36bda5ae451af8cebfb0c8435c017c7773875211 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Gerrit: Do not refresh dialog on update remotes when hiddenOrgad Shaneh2018-06-012-2/+3
| | | | | | | | | | Change-Id: Ie9b00c1a117b1b2a3823dcb9249ed563b3dbd4a7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Squish: Update for changed Options dialogRobert Loehning2018-06-012-7/+7
| | | | | | | | | | Change-Id: I823e88e80a00079dbf0a2cbdfd72973d44001063 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Clang: Fix running UpdateExtraDocumentAnnotations job on outdated documentNikolai Kosjar2018-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | Prior to this change, the UpdateExtraDocumentAnnotations job (e.g. providing the symbol outline information) was running concurrently to UpdateDocumentAnnotations job on the outdated translation unit. Now it runs on the same translation unit after the document was updated. Change-Id: I4d84102423592d8a1310c1ac0ebbce9bd76a3714 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Gerrit: Fix some clang-tidy warningsOrgad Shaneh2018-06-014-7/+6
| | | | | | | | | | Change-Id: Idaccca0bd6d7682feeac8a0964ce2abb788f3e99 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Android: Fix history completer keyChristian Stenger2018-05-311-0/+1
| | | | | | | | | | | | | | | | This patch gets rid of soft asserts regarding empty history key and a warning when trying to store these into the settings. Change-Id: I64440ebe7ae1fca660a1dc66a1646da5d17798bf Reviewed-by: hjk <hjk@qt.io>
* | Clang: Add links to web pages in Clang-Tidy configurationIvan Donchevskii2018-05-314-17/+72
| | | | | | | | | | | | | | | | Each Clang-Tidy check get the separate link except clang-analyzer which has only a whole group page. Change-Id: I0b63cce8475109812280d9d44ac2d36aaa66e03b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Debugger: Add tracpointoverlay.png to debugger.qrcUlf Hermann2018-05-311-0/+2
| | | | | | | | | | | | | | | | We're using it in debuggericons.cpp. Change-Id: I397ee1afb02594d14089fe31bc4dfaee1901ee71 Task-number: QTCREATORBUG-20426 Reviewed-by: hjk <hjk@qt.io>
* | Git: Fix handling Esc in "Create Local Branch" dialogNikolai Kosjar2018-05-311-1/+1
| | | | | | | | | | Change-Id: I8415e7ffcdbeb648b28273aa5791144e95f63de9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Doc: Describe new kit optionsLeena Miettinen2018-05-313-1/+14
| | | | | | | | | | | | | | | | Update the screen shot. Task-number: QTCREATORBUG-20511 Change-Id: Ic21761cae6ba2ac5e29653d3ba27b520256ca66f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlProfiler: Only consider data as lost if we are recordingUlf Hermann2018-05-311-1/+1
| | | | | | | | | | | | | | | | | | If the server stopped recording before breaking the connection, we're fine. Change-Id: Ic6d57cd4eb7c831cdd8aca1f305b44b9ecbd10dc Task-number: QTCREATORBUG-20530 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | AndroidPlugin: show adb output in error caseTim Jenssen2018-05-311-1/+1
| | | | | | | | | | Change-Id: I3a9b1e3ca86ab2cfecefd187d9574cf64ef6b1f1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Tracing: Fix layout of RangeDetailsUlf Hermann2018-05-312-5/+7
| | | | | | | | | | | | | | | | | | Only calculate the minimum width once all the children have been positioned, round up the label width, and disable elision on labels. Change-Id: Ia0ff6d5a08af2a5ceefd825fbe487a1d9969967d Task-number: QTCREATORBUG-20502 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlProfiler: In statistics view use source model for location lookupUlf Hermann2018-05-311-1/+7
| | | | | | | | | | | | | | | | The sorted model's rows are not equivalent to typeIDs. Change-Id: I88868e192079f61bd1d336dac98142fd415d9a4a Task-number: QTCREATORBUG-20501 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | AutoTest: Fix build key handlingChristian Stenger2018-05-311-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | The build system targets no more contain the additional pipe character. This patch fixes some 'guessed config' warnings. The check for the build key can now also be done without restriction as it is unique nowadays not only for Qbs builds. Change-Id: Ic4e62d678c2188d0591c618cdcc156580b40b834 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlProfiler: Actually update the details when rewriter tells us toUlf Hermann2018-05-312-5/+6
| | | | | | | | | | | | | | | | | | Before, only the signal was sent. While we're at it, also disambiguate the method and signal names. Change-Id: Iafce9b06841d7faedfefdb0638d0fa1f60c061c1 Task-number: QTCREATORBUG-20500 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Tracing: Don't change visible features on clearing and replayingUlf Hermann2018-05-314-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This used to be important for the mockup in the Timeline, but as the mockup looks just fine with all available features visible, we can drop it. As TimelineModel::clear() clears the "hidden" flag, we have to restore that one on initialize(), though. As a side effect the visibility settings are retained across profiling sessions now. Task-number: QTCREATORBUG-20503 Change-Id: I1512ab7e494ed79d20e2097d68f8494990cfecbb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clang: Add "Clang Code Model" group box to code model settings pageNikolai Kosjar2018-05-301-13/+22
| | | | | | | | | | | | | | | | ...and move existing widgets (hints about enabled/disabled plugin, diagnostic config chooser). Change-Id: I3097fad30d5bbe578f0a822f6f5615e48c1595b1 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Add "Outline of symbols" to implemented services in docNikolai Kosjar2018-05-301-0/+1
| | | | | | | | | | | | Change-Id: Ic1dd6f644b60c5bdcbbb2a75ca119311c5f827df Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | QmlProfiler: Keep text marks when replaying eventsUlf Hermann2018-05-306-10/+33
| | | | | | | | | | | | | | | | | | | | The text marks are conceptually part of the type storage, not the event storage. We need to hide them on initialize and show them again on finalize, though, so that they get updated. Task-number: QTCREATORBUG-20506 Change-Id: I5fe50110b99ea81b9a7585758a30fcad98bfcaa3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Doc: Add :<range>sor[t][!] to the list of FakeVim CLI commandsLeena Miettinen2018-05-301-0/+1
| | | | | | | | | | Change-Id: Ibe0b9724cdb242c869cdef662cc617d393cd4f4b Reviewed-by: hjk <hjk@qt.io>
* | Core: Fix icon size calculation in the mode bar (Icon + text mode)Alessandro Portale2018-05-291-4/+5
| | | | | | | | | | | | | | | | | | | | | | This amends 768f0a6209392e3d6ce248c5b92c12d2fe711976 . The order of setting a painter font and using the fontmetrics of the painter font got swapped, and therefore the size calculations were done with a wrong font. Task-number: QTCREATORBUG-20404 Change-Id: I98d1fbbbf467ded1dc0288784036595976b46e10 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlProfiler: Suppress debug message in testUlf Hermann2018-05-291-0/+3
| | | | | | | | | | | | | | | | The application is expected to fail after the transition to "Starting" there. Change-Id: I61e69df73ca9db82b9649727b69800927b1c16c5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmlProfiler: Fix comma in qbs fileNikolai Kosjar2018-05-291-1/+1
| | | | | | | | | | Change-Id: I7ac4abf4b9a764c0d9ff2b7c3a8db299e92a2f7c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Debugger: Support nested properties in QML inspectorUlf Hermann2018-05-291-7/+49
| | | | | | | | | | | | | | | | | | There are various ways to generate nested arrays and objects in the QML engine debug service. We can easily show them. Task-number: QTBUG-68474 Change-Id: I3511a3f6f7631de4ab6a9d4b13ba9392ba4173dc Reviewed-by: hjk <hjk@qt.io>
* | ClangTools: Avoid freezing UI for many itemsNikolai Kosjar2018-05-293-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if new items are added to the model or if filter is used. When items were added, we have called ClangToolsDiagnosticModel::diagnostics() two times: * from DiagnosticFilterModel::filterAcceptsRow() * from ClangTidyClazyTool::handleStateUpdate() However, this does not scale since diagnostics() creates a temporary. Fix this by accessing the diagnostics or the count directly from the tree. Change-Id: I4c6a32e0076c1b4228ed1b1ff9222c9918f92c5c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | QmlProfiler: Move action registration out of QmlProfilerToolUlf Hermann2018-05-299-64/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to have multiple QmlProfilerTool instances without conflicting action registrations. Ultimately there should be a way to unregister actions, or to add some extra description on which tool instance they refer to, but this is a minimal first step. The main problem this fixes for now is the warnings generated by the tests. Change-Id: I2193fc48a5a68c52f46e5567919f3035bc93df36 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Clang: Avoid diagnostics about unknown qdoc commandsNikolai Kosjar2018-05-291-1/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-20512 Change-Id: Icbdcf7871738c9900544516467154ef73c595e1b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Doc: Describe new filters in Issues paneLeena Miettinen2018-05-292-0/+6
| | | | | | | | | | | | | | | | | | ... for Clang Code Model and Python. Change-Id: I4a1844137874c5c2c4bd3f0348879cf4c40ceda0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | QmlProfiler: Set the future to finished after loading all eventsUlf Hermann2018-05-293-0/+11
| | | | | | | | | | | | Change-Id: I9b23eb5a10558279a47b9bcc106430d5c2b802e0 Task-number: QTCREATORBUG-20508 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlProfiler: Set the feature on Qml types when loading from qztUlf Hermann2018-05-292-20/+22
| | | | | | | | | | | | | | | | Otherwise they are all invalid and nothing is loaded. Change-Id: I12c71b231c81ce961754c1de67766010f00dd8d5 Task-number: QTCREATORBUG-20508 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ClangTools: Synchronize standalone tool diagnostic settingsIvan Donchevskii2018-05-291-5/+16
| | | | | | | | | | | | | | | | | | | | ...to the global diagnostic settings list. It was possible to add/remove some configurations without adding/removing them to the checks combobox. Change-Id: I31608fd3758c385aa2fb7ce06aceeb0b91403c50 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Doc: Describe the Cancel Build buttonLeena Miettinen2018-05-292-0/+4
| | | | | | | | | | Change-Id: I448cd01cd9d2741ff8a4dcb962ddbf3d839f0aa8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Editor: fix continuosly repainting partially visible annotationsDavid Schulz2018-05-291-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-20422 Change-Id: Id171d8cb3022dd6e345e55fdf029c445bc42c382 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.6' into 4.7Eike Ziller2018-05-289-153/+85
|\ \ | |/ | | | | Change-Id: Ifddceb06f377ea428300fa8a48908cfc44b98705
| * Add changes file for 4.6.2Eike Ziller2018-05-281-0/+51
| | | | | | | | | | Change-Id: If2012dc8a6deb26e1f55205e4d772645553c6f57 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * qmake: fix file id mapping lifetime managementOswald Buddenhagen2018-05-283-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out that flushing the ids together with the ProFile cache was an abysmal idea, as the latter expires after a few seconds after loading the project, while references to the ProFiles (and thus the underlying file ids) are kept for as long as the project stays loaded. the early flush would cause re-use of the file ids, which would wreak all kinds of havoc when re-loading projects. instead, ref-count the vfs class based on its instances. amends 60245e55d7. Task-number: QTCREATORBUG-20113 Change-Id: I7382a71af4d6a991156c05719deae9fb1e4fb278 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * Squish: Configure Qt Creator projects on Qt 5.10Robert Loehning2018-05-243-137/+12
| | | | | | | | | | | | Task-number: QTCREATORBUG-20056 Change-Id: I0d12747ac9510fbab2cbe1e751d3613608a07053 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Debugger: Remove a too strict error handlinghjk2018-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's seems to be the possibility to actually trigger the assert this patch removes with MinGW and mixed debugging. While the reason for that is not clear yet, there's no need to force the debugger to abort. The observer wrong state was InferiorRunOk, so just continuing on the selected path will do the right thing (i.e. attempt to interrupt the debugged process) Change-Id: I534cedd71522e73d5f1097ddd472efbeb3b4d97f Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status