summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Clang-cl: Fix restoration of clang-cl compilerAndy Shaw2018-03-262-6/+12
| | | | | | | | compilerCommand was not restored, so isValid failed. Task-number: QTCREATORBUG-19255 Change-Id: Idc65aaf2eaad348f05cdf4dfd057bbd10c6c4e4c Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericProject: Fix adding several makestepsTobias Hunger2018-03-231-4/+1
| | | | | | | | | | | | Fix adding several makesteps to generic projects again. The problem used to be that the constructor called by "Step" set a buildTarget of "" via the delegation to GenericMakeStep's constructor and then added "all" explicitly. So it was attempting to build two targets, with the empty target being a syntax error. Task-number: QTCREATORBUG-20108 Change-Id: I7382a1fa8b8b5869e6be11367e27d6a786f6aa74 Reviewed-by: hjk <hjk@qt.io>
* Clang: Check that local renaming QFuture is not cancelledIvan Donchevskii2018-03-201-0/+2
| | | | | | | | We can't take QFuture result if it's cancelled. Task-number: QTCREATORBUG-20008 Change-Id: I781746cf1d638627bb5992efa23d94111908f6d0 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* ProjectTree: Add missing registration of pre-existing projectsTobias Hunger2018-03-161-1/+3
| | | | | | | | | Register pre-existing projects when opening a new Project View. This fixes missing parsing state on newly opened Project Views. Task-number: QTCREATORBUG-20058 Change-Id: I47cd4791c1b8eac7717a7ce2b35d7f35bba5826a Reviewed-by: hjk <hjk@qt.io>
* Fix scrolling in file system viewEike Ziller2018-03-161-0/+1
| | | | | | | | | | The style can set the scroll bar to scroll by item, which breaks the automatic scrolling that adapts for size changes of the bread crumbs. Force the tree view to allow pixel-exact scrolling. Task-number: QTCREATORBUG-19800 Change-Id: If61640a1b6e3b4a777269fb129bdc2689bad19c2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix image border for examples browserEike Ziller2018-03-151-1/+6
| | | | | | | | | | | It was made smaller for the tutorials to fit the new aspect ratio for their images, but we may not do that for the examples. Fixup for 7d834729065668 Task-number: QTCREATORBUG-20078 Change-Id: I556536a7e299e8f675332cd7450ece5fca6fab0a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Move git specific stuff out of diff editor pluginJarek Kobus2018-03-1513-186/+370
| | | | | | | Move it to the git plugin. Change-Id: I8151573ed50df70776f7ebf0475dd41fb84fae83 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlPuppet: enable reset the default puppet buttonTim Jenssen2018-03-151-4/+14
| | | | | | | | | | Also fix the logic that empty means that it should use the default fallback puppet. Task-number: QTCREATORBUG-19511 Change-Id: Ia36907523281386a1ed56362a76e37aaa9ee16b2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QtSupport: Fix loading of tutorial thumbnailsv4.6.0-rc1Alessandro Portale2018-03-141-3/+3
| | | | | | | | Amends 7d83472906566857f9afaa95440a41d1ed5edcae Used the HighDpi loader in the wrong place. Change-Id: I5bb7328167c0a9da811db92102feea67ee97c6c4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* qmake: Change source identifier type in ProStringOswald Buddenhagen2018-03-146-26/+35
| | | | | | | | | | | | | | | | | | | | | The strings remember in which file they were created/assigned. However, this used a non-counting reference to a ProFile, which could become dangling. If a subsequent ProFile re-used the exact same address, a string's source would be mis-identified, which would be fatal in conjunction with discard_from(). Since we actually need only a unique id for comparison, let's use an integer for that. comment on cherry-pick: this is actually a lot more than a cherry-pick, because the file ids need to be aware of the dual VFS which was concurrently introduced on the qtc side. Started-by: Simon Hausmann <simon.hausmann@qt.io> Change-Id: I395153afaf7c835d0119690ee7f4b915e6f90d4a (cherry picked from qtbase/190aa94be7f5e146bef44862b974d733755cec85) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Doc: Add link to Qt Quick Designer tutorial video from TutorialsLeena Miettinen2018-03-141-0/+4
| | | | | | Change-Id: I17c4188e828295549c3c741ec4c8ab95c5bb5a3e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Wizards: Fix Qt Unit test wizardChristian Stenger2018-03-131-2/+1
| | | | | | | | | Remove unused define which lead to build errors if the build directory contained white spaces. Task-number: QTCREATORBUG-20047 Change-Id: Ieea4b61d6936479dfcd87714baed0854d4b4ced1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Re-add RunConfiguration display namehjk2018-03-131-0/+2
| | | | | | | | Amends 6f04ca646 for QTCREATORBUG-19762? Task-number: QTCREATORBUG-19954 Change-Id: I5da8bf15b5b62500fd0936d15451dfefd878b57b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Android: Pull linker from device/emulatorVikas Pachdha2018-03-132-31/+24
| | | | | | Task-number: QTCREATORBUG-19931 Change-Id: If8f0b5fe767f9e816ac5163142d4fa38e0f6540f Reviewed-by: hjk <hjk@qt.io>
* BinEditor: Do now show tool tip if mouse is not over dataEike Ziller2018-03-132-15/+28
| | | | | | Task-number: QTCREATORBUG-17573 Change-Id: Ida0497006e702dfafe70f434373088325bbc6db7 Reviewed-by: David Schulz <david.schulz@qt.io>
* BinEditor: Fix that posAt could be larger than available bytesEike Ziller2018-03-131-6/+5
| | | | | | Task-number: QTCREATORBUG-17573 Change-Id: Ia34bb9b6765850937793d6481bb1e6404319d510 Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix binary editor tool tipEike Ziller2018-03-131-10/+25
| | | | | | | | | | | | It should show up also over the last column, it should also show up if the selection spans multiple lines, and if the mouse is not over the selection it show up with information about the single byte under cursor. If the mouse is over a selection that is longer than 8 bytes, the tool tip is restricted to the first 8 bytes of the selection. Task-number: QTCREATORBUG-17573 Change-Id: Ie7aaf1e52ceadd6be815d4ce3386a60df1418297 Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: fix gcc toolchain abi detectionDavid Schulz2018-03-121-1/+1
| | | | | | | | | This updates the selected abi in the toolchain widget when editing the binary path to the compiler. Task-number: QTCREATORBUG-19673 Change-Id: I8df69af207360364fb6f75e94a3aa26f84fd13d9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Doc: Add a link to a new Qt Creator and Qt videoLeena Miettinen2018-03-121-1/+5
| | | | | Change-Id: I3ea8c67e5cb967fc5c963b96c30a4de1ff1baa63 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Fix ordering of items without file name in open documents popupEike Ziller2018-03-121-1/+2
| | | | | | | | | | An item that has no file name (like Git Commit, Diff etc.) was always last in the list. Broke by 324de13b4e6703db778010d0682ac26cff359516. Change-Id: Ied3add2a372b4b176ee800e8c023c3cef5495488 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QbsProjectManager: Fix "equivalent command line" contentsChristian Kandeler2018-03-122-2/+2
| | | | | | | | | - We forgot to adapt to the introduction of the "config" key. - The space character was missing before the QML debugging property. Task-number: QTCREATORBUG-20024 Change-Id: Ie4a94a04989caa14b1ddc11c8595d679d1871625 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QmlDesigner: void static -> static voidOrgad Shaneh2018-03-121-1/+1
| | | | | | | That's the order everywhere in the codebase. Change-Id: I62e57f2ddddd6e4fac0dc26d81b05839cf80a9db Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix compile for Qt5.6Christian Stenger2018-03-121-2/+2
| | | | | Change-Id: I25cdf8874c03865400a3a1bc451c6c58e9294ab0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QtSupport/Welcome: Refresh the tutorials/examples/videos thumbnailsAlessandro Portale2018-03-119-8/+11
| | | | | | | | And adjust the drawing code to support the HighDPI variants. Task-number: QTCREATORBUG-19942 Change-Id: I77b07674305b29680de27714fc56f1ad25f5346d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Add meta hint if item renders children directlyThomas Hartmann2018-03-093-8/+51
| | | | | | | | | | | | In some cases items render their children directly using an effect. In this case we do not want to hide the children when calling refFromEffectItem(). If the hint takesOverRenderingOfChildren is set in the .metainfo hints for a parent item we forward a flag to the puppet and refFromEffectItem() is not hiding this item, Change-Id: I37a8c0ad8a15bc914c220e03b1b744779431d655 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Define new possible enum scopesThomas Hartmann2018-03-091-1/+1
| | | | | Change-Id: Ifb96706615be8cd5d7f588a83bdfe1cf31886bb5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ProjectTree: Select only (complete) file basename on renameAlexander Akulich2018-03-091-0/+13
| | | | | Change-Id: I29effc5f61fbaa214d7a1a01d92de5d5a726cec4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectTree: Refactor editCurrentItem()Alexander Akulich2018-03-091-2/+5
| | | | | Change-Id: Id848b608e256b95e9704d61d1926d05625106ecc Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlProject: Fix selection of supported kitsTobias Hunger2018-03-091-1/+1
| | | | | | | | | This now fixes the auto-selection of kits for me. Task-number: QTCREATORBUG-19717 Change-Id: I39581ab2471211e9553c345164bb3ce788242dad Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlProject: Unify selection of supported kitsTobias Hunger2018-03-0910-46/+44
| | | | | | Change-Id: Ic33e9688d823bd09664e5dc74fe5253cb5fcbc58 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Class view: Fix keyboard focus when using shortcutEike Ziller2018-03-091-3/+5
| | | | | | | | | Pass focus to the treeview, and make sure something is selected, so focus is also visibly moving there. Task-number: QTCREATORBUG-15920 Change-Id: Icf7c213765739e992edcb52cc88f8730875e0bed Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Fix C++ type hierarchyEike Ziller2018-03-093-3/+19
| | | | | | | | | | | | | Dynamic casts between library boundaries tend to fail. Add an "explicit cast" to CppClass via virtual functions as a quickfix. This is a recurring issue, e.g. d2769f30037aa, 3f11ef92167ba and 2ffd0e2d0da5d to name just a few... This was introduced in 5e861d2be6729 Task-number: QTCREATORBUG-20001 Change-Id: Ie5a89a028d587e4e9d1ecec920a7c7d17497dbde Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* QmlDesigner: Fix compile before Qt5.10Christian Stenger2018-03-091-1/+1
| | | | | | | | QString::back() was introduced in Qt5.10. Beside this fix the signature change of void checkNode(). Change-Id: I4945e618274e1a67fc36d33e875c14284a4b160c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Debugger: Move DebugInfoTask handling to pluginhjk2018-03-084-68/+47
| | | | | | | | This does not involve the engine (currently). Task-number: QTCREATORBUG-19994 Change-Id: I07a628580bf99c988eb0df165d649d5cc0869c0d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ITaskHandler: Harden against vanishing ITaskHandlersTobias Hunger2018-03-081-11/+10
| | | | | | | | | Harden against vanishing ITaskHandlers and avoid qobject_casts. Task-number: QTCREATORBUG-19994 Change-Id: I72bccb944cb6fa6ec92a8c0293617931a2eb2732 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Fix buildChristian Kandeler2018-03-081-4/+4
| | | | | | | | | Fixes an error and a warning, and removes a local inconsistency regarding "void static" vs "static void". Change-Id: I1685823162290cb7d5f2df9cef6e32928fbf0a32 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* NewDialog: Add option for wizard listThomas Hartmann2018-03-081-0/+16
| | | | | Change-Id: I2b1b09bd64507b9875f9770d20233b7ec936f075 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Allow annotations in commentsThomas Hartmann2018-03-084-2/+179
| | | | | | | | | | This patch allows to store the auxiliary data of model nodes as meta data in the QML file. The meta data is encoded in a comment at the end of the QML file. By default such meta data is attached to the clipboard. Change-Id: I794d2c1297d270c5c1099c6c1be98b6b7a7f650b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlProject: Clean up environment selectionUlf Hermann2018-03-072-13/+21
| | | | | | | | | | | | | | | | On desktop you get "system environment" as default now and "clean environment" as option. "kit environment" doesn't make any sense as that is meant for build configurations. On remote Devices you only get "clean environment" because we cannot query the generic remote device for its default environment. However, as the environment was rather random before and it worked, a clean environment will probably not break it. Change-Id: Iab0ed804a21cf77db9e3413926ff710c91561db0 Task-number: QTCREATORBUG-19887 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* RunConfigurationFactories: Fix crash opening non-qmake based projectsTobias Hunger2018-03-077-9/+20
| | | | | | | | | Make sure the Qnx RCs only get triggered for qmake-based projects and defend against broken set-ups using QTC_ASSERT. Task-number: QTCREATORBUG-19755 Change-Id: If64b73de49b0199308f767151d68909dc8b1bc53 Reviewed-by: hjk <hjk@qt.io>
* AutoTest: Fix marking for removalChristian Stenger2018-03-071-2/+3
| | | | | | | | | | | | | | | If marking a test case for removal by file it could be possible that children of this test case are not marked because of being located inside a different file. When performing sweep the test case and the not marked children would be gone as the test case is marked and so sweep would not look into the children. This currently can only happen for gtest based test cases as registering the tests is different and the test case stores here the path of the first found test set. Change-Id: I712054534307ee2839894c5148ae04b86b9df967 Reviewed-by: David Schulz <david.schulz@qt.io>
* Git: Show decorations in commit detailsOrgad Shaneh2018-03-071-1/+1
| | | | | Change-Id: Ifbf4737b0d374006a69b7005e4c6a032d5bf43e3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Clang: Don't translate tidy checksRobert Loehning2018-03-061-16/+16
| | | | | | Change-Id: I1bcefd69bc4e7e6705bd8f3d2d992bd544244949 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QmlDesigner: Remove duplicates from tag listThomas Hartmann2018-03-051-0/+1
| | | | | Change-Id: I09f59b0be9edf58476ab14e2c5888c87a87738f5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix crashThomas Hartmann2018-03-051-0/+3
| | | | | Change-Id: I9ce5492c6c3c7da243ef9c1850b4a27762becb51 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix crashThomas Hartmann2018-03-051-1/+2
| | | | | | | This did crash if the meta info is invalid. Change-Id: Idb560b570b7951c02a4165cc1936952478bd00d7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix crash in kit's variable chooser if Qt version is removedEike Ziller2018-03-053-93/+185
| | | | | | | | | | | | | | | Currently the variable chooser cannot update itself if a sub-expander changes or even is deleted, leading to inconsistencies and crashes if that happens. Make the Qt version sub-macroexpander be available for the kit even if currently is no Qt version selected. For this we create a macro expander that delegates to the kit's Qt version if possible at variable substitution time, instead of taking the Qt version's expander directly. Task-number: QTCREATORBUG-19900 Task-number: QTCREATORBUG-19901 Change-Id: I2bd9b3db60bf6e292abf2a29e0697dc5385709cd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix middle mouse button in help viewerEike Ziller2018-03-051-1/+1
| | | | | | | | | It didn't do anything on links though opening links in new pages was its purpose. Task-number: QTCREATORBUG-19344 Change-Id: I9560a59bd2ad4ec7179dce984cf3bc5160b84ff3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Fix issue with snippet variables not behaving correctly on GnomeEike Ziller2018-03-051-0/+8
| | | | | | | | | | | | | | Directly after triggering the snippet completion, a funny input method event is sent that doesn't contain any data. This still results in a even more funny contentsChanged signal from QPlainTextEdit which made our text editor think that the document has changed somewhere else. In which case we close the snippet variable input. So ignore funny input method events. Task-number: QTCREATORBUG-19571 Change-Id: I3958e8736b1b3e3dea5225356ee4cd173d6beaa0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-03-022-2/+2
|\ | | | | | | Change-Id: Iaf254ce5bc895c703aa6772b4aaa139e531696f6
View Lorry Controller Status