summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Fix macOS menu issue4.3Thomas Hartmann2017-08-101-2/+0
| | | | | | | | | | Introducing the Loader broke the menu on macOS. There is no reason to disable the Loader. This was premature optimization. Task-number: QTCREATORBUG-18662 Change-Id: Ief00246182ab1f1096efec634ed0626aeba95c84 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* QmlProfiler: Avoid empty timeline when restricting to rangesUlf Hermann2017-08-077-7/+139
| | | | | | | | | | The timeline models were suspended for editing but never restored. To test the correct behavior a test case for the trace view is added. Change-Id: Ic1803e9d84656eed97795f1f1674e3d56c83f650 Task-number: QTCREATORBUG-18354 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Dev package: Collect from all directories except tests/ and share/Eike Ziller2017-07-281-6/+5
| | | | | | | | Except for the qmlpuppet directories under share/. Some plugins have other directories to look into than plugins/. Change-Id: I89cc61d02c39ecee2cfb6db72986003651ca4b9c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ModelEditor: Fix a crash moving packages into itselfJochen Becher2017-07-261-0/+7
| | | | | | Change-Id: I1a722b9514ee0a57d8bd8be2f4ea05ed87c6686d Task-number: QTCREATORBUG-18262 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Fix progress calculation in server-modeTobias Hunger2017-07-253-2/+76
| | | | | | | | | Add unit test to make sure this stays fixed. Task-number: QTCREATORBUG-18624 Change-Id: Ieeb41982418481223d9ebf8f5c6ec4b3b78bfe00 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Welcome: Add links to the new video tutorials from Tutorials tabLeena Miettinen2017-07-213-17/+30
| | | | | | | Change-Id: If38ff8abd3ddedae7cd368bc67d533dfeff22208 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Modeling: Do not crash on invalid qmodel files in a projectTobias Hunger2017-07-131-1/+7
| | | | | | | Task-number: QTCREATORBUG-18526 Change-Id: I2947f9227c6f96b2b576ca6e942c3f27f28116b3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
* Introduce setPerspectiveEnabledHannah von Reth2017-07-114-0/+19
| | | | | | | | This enables us to mark perspectives as disabled. Change-Id: I52b2434f33f8550b6d2459f915dfd8cdb1389140 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Qmljs: fix a crash when m_treeview is deletedTim Jenssen2017-07-111-4/+4
| | | | | | Change-Id: I3743815c14151b49784a20cdb0c0bba2fbde4e7b Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QbsProjectManager: Fix qbs build against installed qbsChristian Kandeler2017-07-101-0/+1
| | | | | Change-Id: Icfe86b98ab8162fe613dbf089fec1692c5d3dbea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qmlpuppet: add missing includesMarco Benelli2017-07-102-0/+3
| | | | | | Task-number: QTCREATORBUG-18498 Change-Id: Ie40a066508bb52f53b8ad528f9d4cf6969fc0632 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix the deployment target problem once and for allJake Petroules2017-07-072-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of hardcoding the value of LSMinimumSystemVersion in Info.plist where we will always forget to update it (and since Qt Creator can be built with multiple versions of Qt, it will almost certainly be wrong for one of those versions), automatically determine the value from QMAKE_MACOSX_DEPLOYMENT_TARGET, which is authoritative. This should prevent mishaps where users try to run Qt Creator on older OS versions and receive a crash dialog instead of the friendly "This app requires a newer version of macOS" message that a properly set LSMinimumSystemVersion value will induce. The Qbs build is not affected by this problem, as Qbs automatically handles the minimum deployment target even when a custom Info.plist is specified. The solution chosen in this patch was used instead of QMAKE_SUBSTITUTES because the Qbs build also uses the Info.plist input file and it would break the Qbs build if the quotes were to be escaped, since it would become invalid XML. Change-Id: I20625a2fae546c6597a567f28864b12917e8ac39 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Qbs: fix bundle installation with Qbs 1.8Jake Petroules2017-07-073-9/+6
| | | | | | | | | | This patch also sets the minimumQbsVersion to 1.7 because that's the version that is actually documented as being required in the README. Change-Id: I862daaf5fa34ab2cc5db47581689e08aa34f0910 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* C++: Fix crash for invalid codeNikolai Kosjar2017-07-062-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | ...due to indirect recursion: ... CPlusPlus::ClassOrNamespace::lookupType LookupContext.cpp 833 0x7fffd6c954cc CPlusPlus::ClassOrNamespace::nestedType LookupContext.cpp 1364 0x7fffd6c94bc6 CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 955 0x7fffd6c9517f CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 983 0x7fffd6c952ad CPlusPlus::ClassOrNamespace::lookupType LookupContext.cpp 833 0x7fffd6c954cc CPlusPlus::ClassOrNamespace::nestedType LookupContext.cpp 1364 0x7fffd6c94bc6 CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 955 0x7fffd6c9517f CPlusPlus::ClassOrNamespace::lookupType_helper LookupContext.cpp 983 0x7fffd6c952ad CPlusPlus::ClassOrNamespace::lookupType LookupContext.cpp 833 0x7fffd6c954cc ... ClassOrNamespace::lookupType(const Name *) already guards with a list of entries already processed, but some calls deeper the list is not passed on and lookupType() starts again with an empty list. Handle that case, too. Task-number: QTCREATORBUG-18499 Change-Id: Iab8978f6ac1d0aea16f49b3547415f43de887b07 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Update binaries' supported macOSEike Ziller2017-07-052-2/+2
| | | | | Change-Id: If51b0395b509c8e943688a9f00352b4ac5800369 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QmlJs: avoid overwrites by auto-completionMarco Benelli2017-07-043-27/+37
| | | | | | | | | | | | | During auto-completion, the cursor used to randomly jump to the beginning of line, eventually overwriting existing text. This patch blocks the signals of the selectionModel while it refreshes the content of the outline model. Also cleans up a unnecessary variable and make it clear where we blocks with using a lambda. Task-number: QTCREATORBUG-18449 Change-Id: I94317c76b4e13d07ef7f3355b766e5473ab21011 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Introduce priorities for RunControlFactoriesv4.3.1hjk2017-06-283-1/+26
| | | | | | | | | 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>
* AutoTest: Improve finding executables for cmake based projectsChristian Stenger2017-06-272-0/+13
| | | | | | | | | | | | Depending on the structure of a project we might end up inside a library and will not find the correct executable for running a test. This patch improves finding the correct executable, but depending on the complexity of the project it will not be able to fix all circumstances. Task-number: QTCREATORBUG-17882 Change-Id: I847bb40426bc1b874c2dc6a2a6880b11fe048bda Reviewed-by: David Schulz <david.schulz@qt.io>
* Qbs: Fix crash when renaming filesTim Jenssen2017-06-263-11/+20
| | | | | | | | | | | | | | | | Fix a crash when using file nodes to change the project. The methods used to take const references, with the data living in the nodes of the project tree. Since the methods change the project tree and thus cause the tree to be rebuilt, the original data may get lost. So copy the data instead. All the qbs::*Data classes are using shared data, so the overhead is not too big. Task-number: QTCREATORBUG-18440 Change-Id: I45ca5403a04e17790416dfe15b836f12c732e824 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* AutoTest: Fix finding runconfig for multiple build targetsChristian Stenger2017-06-261-8/+13
| | | | | | | | | | | | As we are still constructing build system target to compare with on the test runner's side instead of getting the complete information from the run configuration we ended up using the wrong one in several circumstances. Avoid this by using the executable information we already got. Task-number: QTCREATORBUG-17783 Change-Id: I40431bef228f7070109297873c472fea410dbd16 Reviewed-by: David Schulz <david.schulz@qt.io>
* Add more changes for 4.3.1Eike Ziller2017-06-261-0/+79
| | | | | | Change-Id: I11e5650fdd77c8eb0fb62beefaad2d9af81e96ed Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update qbs submoduleChristian Kandeler2017-06-261-0/+0
| | | | | | | To HEAD of 1.8 branch. Change-Id: I78de243f6a383f08b29e4a4807092c4f003d55ad Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QmlDesigner: Be more specific with overriding shortcutsThomas Hartmann2017-06-261-5/+9
| | | | | | | | | We have to be less aggressive when ovveriden keys, so that shortcuts like strg+shift+up/down still work. Task-number: QTCREATORBUG-18361 Change-Id: I2f4819f627f8820533b603575e853aec7d91171d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlJS: keep track of cursor position in reformattingMarco Benelli2017-06-261-4/+10
| | | | | | | Task-number: QTCREATORBUG-18416 Change-Id: I30c07e0bff1b3f3933ff0e4aee8f1f2c81bd5ef6 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ProjectExplorer: Fix crash in AppOutputPaneTobias Hunger2017-06-231-11/+9
| | | | | | | | | | The RunControl owns the Formatter set on the OutputWindow. Make sure the OutputWindow is deleted before the RunControl and avoid some useless setting of the Formatter. Task-number: QTCREATORBUG-18428 Change-Id: I40c8f032bb04c484957a35a6bbc0fda7b6491c51 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Return an empty project tree if parsing failedTobias Hunger2017-06-235-5/+11
| | | | | | | | | | | This triggers the logic in Project to show the top level project file in the project tree. Remove similar logic in CMake. Change-Id: I2bfdd3f5e3d4126910a3feb480cec5ef689954ed Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Florian Apolloner <florian@apolloner.eu>
* QmlDesigner: Avoid accidentally changing gradientsThomas Hartmann2017-06-234-17/+40
| | | | | | | | | | | The designer was changing gradient stops if the item "selected" in the edit mode has a gradient. The first gradient stop was set to white. There is still an issue with setting up the gradient editor in this case, but the file is not changed anymore. Task-number: QTCREATORBUG-18421 Change-Id: Ifd6829590a8a7b5217c53f49054f8738bdb71563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix combobox for font familyThomas Hartmann2017-06-231-3/+26
| | | | | | | | | | | | | | | | | | | | | The editable combobox had some serious issues. I changed the signals we react to and the properties we use. We react on activated to change to fonts in the model. For some reason using currentText does not work reliable. We have to retrieve the current etxt manually using textAt(). We also react to accepted to changes in the text edit. Here we simply use editText. We also react to selection changes and change the font. Change-Id: I99abd7609f8b64ef446ce154aed0c2a61dfa00f9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Use ";" as delimiter for QMLDESIGNER_RC_PATHSThomas Hartmann2017-06-221-1/+1
| | | | | | | This is what is used in the qml2puppet. Change-Id: I5c9ce65863539395d0f2c56e7be89998fd26f341 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Revert "Make the output window readonly, but still keyboard friendly"hjk2017-06-221-2/+0
| | | | | | | | | | | | | | | | This reverts commit 3080d0d9e71ecfe89ee3af4982741beb01ce971e. Having the output pane editable is considered a feature by some as it allows easy modification of the contents before passing into other, less accessible interfaces, like Gerrit comment fields. Task-number: QTCREATORBUG-18418 Change-Id: Ice0c6c5e5787d242c714a7b0f61559a70d25d243 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Debugger: Do not crash in (im)possible situationshjk2017-06-221-7/+15
| | | | | | Task-number: QTCREATORBUG-18427 Change-Id: I800c2f8d4ea37b28022d789a2e519e4f5286f08a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* CMake: Fix logic for target filteringTobias Hunger2017-06-211-4/+4
| | | | | | | | Broken by e42f3db9f0ab1ec28bf9ba414add84d3b552118f from today:-/ Sorry. Change-Id: I4803039939de5aae893a701e2bd6399d3fbfae1f Reviewed-by: Florian Apolloner <florian@apolloner.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Tests: Fix compileChristian Stenger2017-06-212-2/+14
| | | | | | | Broke with 4e96f2ce. Change-Id: I7c467cc92cc8444bd3b1ef41eebff089668a0f31 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Clang: fix intrinsic errors with boostIvan Donchevskii2017-06-211-0/+1
| | | | | | | | | | | Add extra define not to include intrinsic headers from boost headers. Task-number: QTCREATORBUG-16439 Change-Id: I887fe63e2560afebdbe9f3d3587f99f95d408997 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* CMake: Improve parsing of "CMake Error at" messagesTobias Hunger2017-06-211-1/+15
| | | | | | | | Handle more "CMake error at" messages. This includes the generic "Parsing failed" message from cmake. Change-Id: Ie036c606bd7a8ad9cafbc32a34a77f8b95c3defa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Remove spurios newlinesTobias Hunger2017-06-211-1/+1
| | | | | | Change-Id: I6f381d4df8b9174f74d1b44364e0fbea58c1e6b6 Reviewed-by: Cristian Adam <cristian.adam@gmail.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Do not use version manager cache in threadsTobias Hunger2017-06-206-17/+55
| | | | | | | | | | | | Do not use VcsManager's cache of version control systems from different threads. Iterate over all IVersionControls instead of getting the specific version control for a directory. This is less exact, but will probably not hurt users. Task-number: QTCREATORBUG-18258 Change-Id: Iae2be5735a0d7ecc8d774904f6681963fca1d114 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Avoid duplicate build targetsTobias Hunger2017-06-201-1/+6
| | | | | | | | | | Make sure that build targets that get added explicitly are never reported by any of the readers, too. This makes sure entries will not show up twice in the UI. Task-number: QTCREATORBUG-18409 Change-Id: Id5039add262211fd87cd5c2884df2af0fcf24577 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Make sure no empty strings end up in deployment dataTobias Hunger2017-06-201-2/+7
| | | | | | | Task-number: QTCREATORBUG-18406 Change-Id: I0b9f8ca76cee8ad2e9ae2ee1f124f16f473033d5 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Only handle strings at start of lineTobias Hunger2017-06-201-8/+13
| | | | | | | | | | Allow comments at the start of line only (or after only space characters) in CMakeCache.txt-style lines. Task-number: QTCREATORBUG-18385 Change-Id: I8b69144ea4f6a667ae1df382c8c4c1e88eca799b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Do not react to builds in the backgroundClaus Steuer2017-06-202-3/+16
| | | | | | | | | | | | | | | | If an error occurs while persisting or updating the cmake state, the build might continue for a while in the background. CMakeBuildStep does not disconnect the Error/Run-Trigger when an error is signaled by the CMakeBuildConfiguration. Instead it reports the build as finished (with error). The BuildManager then disconnects the output and runs the next item in the build queue (if any). However the cmake step might still be alive and emits the dataAvailable signal which then triggers the build process. Task-number: QTCREATORBUG-18382 Change-Id: I956133fe8c6f7de58b9f842b231c70d24778b1e0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: The first build of a cmake project always fails in tealeaf modeClaus Steuer2017-06-201-0/+4
| | | | | | | | | | | | | | | | The TeaLeafReader tries to parse the CMakeCache.txt before cmake is executed for the first time. The error is signaled to the CMakeBuildStep which reports the build as a failure. Make TeaLeafReader::takeParsedConfiguration return an empty CMakeConfig object if the CMakeCache.txt file does not exist instead, but do not report an error. Task-number: QTCREATORBUG-18290 Change-Id: Ibfc43858938477ae7479029e8fe6786c77823014 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AppOutputPane: Do not reset the formatter after the RC has finishedChristian Kandeler2017-06-201-2/+0
| | | | | | | | | | | | Otherwise, clicking on links will have no effect. This feature was broken with commit 113134b3b6. Task-number: QTCREATORBUG-18134 Task-number: QTCREATORBUG-18334 Change-Id: I3cf5d8a9b3957a3f06cb3dbba40bb2dd16a9f8a9 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* MacroExpander: Prevent loop with subprovidersTobias Hunger2017-06-203-7/+16
| | | | | | | | Prevent a loop where a subprovider of a macroexpander creates the macroexpander itself. Change-Id: Id2f3e29651aeb22c818091d8c785a6ea01545463 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Report more cmake errors in server modeTobias Hunger2017-06-202-2/+22
| | | | | | | | | Handle more kinds of errors in CMake server-mode. Task-number: QTCREATORBUG-18318 Change-Id: I43fff7f3cfbd86d01ff05a0936261b8d91aa5d70 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: Hide INTERNAL and STATIC configuration entries in Project UITobias Hunger2017-06-203-3/+11
| | | | | | | Task-number: QTCREATORBUG-18403 Change-Id: I6b69305ff0dc337da1d8b20e0321be5ce1b1f595 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qmake: Only offer Add Library wizard for qmake projectsTobias Hunger2017-06-201-1/+1
| | | | | | | Task-number: QTCREATORBUG-18415 Change-Id: Icd8535a6d7d599457c23f92958fa969661076ade Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: substitute __float128 with short instead of voidOrgad Shaneh2017-06-201-1/+1
| | | | | | | | | | | | There is an argument of this type in std_abs.h. void argument is invalid. Replacing with float, double or long double causes an error in type_traits, which has template specializations for __is_floating_point_helper for all these types. Change-Id: Ife95fa992cbf9684bc67a2098d6609a9a925d015 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Properly mark "Check for Updates" menu item as an app-specific itemJake Petroules2017-06-191-0/+1
| | | | | | | | Check for Updates menu items are supposed to be displayed in the application menu on macOS, not the Help menu as for other platforms. Change-Id: I8d13f2658b3b0e0b9b01ef5b64bd7804d6b7e424 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AutoTest: Fix handling of multiple build targetsChristian Stenger2017-06-1913-23/+78
| | | | | | | | | | | | | If project files are not mapped 1:1 to targets the result of the chosen executable was more or less random. Try to handle multiple targets as correct as possible by checking for build targets already where we still know which files are part of the respective test cases. Task-number: QTCREATORBUG-17783 Task-number: QTCREATORBUG-18357 Change-Id: I82dcc26bf52c9918e2727b439a719af08879ef49 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
View Lorry Controller Status