aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove copying settings from Nokia directoryv4.7.0Orgad Shaneh2018-07-161-1/+1
| | | | | Change-Id: I550b62ab74505f72eee5c8daba206f80dd5a3a34 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qml Profiler: Do toggle extended statistics when option is checkedUlf Hermann2018-07-161-1/+1
| | | | | | Task-number: QTCREATORBUG-20778 Change-Id: I3390241c25ab7a87329bc8b20c49c32cf4c02944 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* BinEditor: Fix "Find Next" for a single charOrgad Shaneh2018-07-161-1/+1
| | | | | Change-Id: If35807230969d3620a3a9018af8d2c21236cd58d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Make Collapse All action for project tree workTobias Hunger2018-07-131-2/+2
| | | | | | | | | Creator registers a "Collapse All" action for the Project tree. Make this work again. Task-number: QTCREATORBUG-20771 Change-Id: I49f1c8a97c4eb22ef6f7f703eefdfe46c3c0a035 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Suppress class-memaccess warnings for GCC8Orgad Shaneh2018-07-131-0/+9
| | | | | | | | | They appear a lot in Clang headers. Until this is fixed in Clang, suppress them. Change-Id: I5292ae442089aec3f52ba846ee21e0bd9e61d0cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Tracing: Don't rebuild flame graph if there is nothing to seeUlf Hermann2018-07-121-5/+7
| | | | | | | | | | If the root size is 0, none of the nodes will be visible. Don't create them in the first place. Task-number: QTCREATORBUG-20772 Change-Id: I9595daece2d17fe8202b322ffafd361d6fa422fa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AutoTest: Handle direct usage of quick_test_mainChristian Stenger2018-07-123-3/+75
| | | | | | | | | | | | If users need to register additional QML types before Qt5.12 they need to bend the Quick tests magic a bit and use quick_test_main or quick_test_main_with_setup directly. The plugin supports something similar for QTest::qExec, so allow this for Quick tests as well. Task-number: QTCREATORBUG-20746 Change-Id: I672f8410914c6cc77abc901998f419dda35755ae Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Fix assert when filtering examples / tutorialsEike Ziller2018-07-121-4/+67
| | | | | | | | | | | | | | | | | | | | | The examples are put throw two proxy models. The first one implements the sorting and filtering, the second one transforms the list into a grid. The grid proxy model was based on QIdentityProxyModel, which is wrong because that explicitly states that it should be used when the structure of the model stays the same. Even QAbstractProxyModel works under the assumption that all items in the proxy model correspond to an item in the source model, which is not true for a N*M grid. Just implement the proxy model "by hand", making sure that all items that cannot be mapped to the source are handles correctly as "empty" items. Task-number: QTCREATORBUG-20641 Change-Id: Id08b77bb7157b893b9d0d73dc006db98d90032b7 Reviewed-by: hjk <hjk@qt.io>
* ProjectModel: Fix crash when updating parsing state of projectTobias Hunger2018-07-121-2/+8
| | | | | | | | | Fix crash when updating the parsing state of a project during the time between the project being removed from the session and the time when the project is actually destroyed. Change-Id: I54bf4793626497315fe588ebb68474b880de2984 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Fix building on current executable targetTobias Hunger2018-07-121-1/+1
| | | | | | | Task-number: QTCREATORBUG-20763 Change-Id: Ie25c0993c1c2051de3f6a15fca56b56caaa04b00 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* FileProperties: Use native separators for file pathAndre Hartmann2018-07-121-1/+2
| | | | | Change-Id: I66c9f62b0c48165f5160d117ad3f0cf5e84f686b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix that Qt Quick Designer did not request Design mode creationEike Ziller2018-07-121-0/+1
| | | | | | | | | | If you turned off Designer and ScxmlEditor plugins, you'd not get Design mode even if you have Qt Quick Designer. Fix-up of 299da013325be20ff731b91e7ead47b20242b1cd Change-Id: Ib3a269db9630af09c36968435ca0b0d998cc1709 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update qbs submoduleChristian Kandeler2018-07-121-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: I3b0115655d3f3735730250a06b96805bc343dee8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* AutoTest: Fix handling of cpp files for Quick testsChristian Stenger2018-07-114-4/+43
| | | | | | | | | | | | | | | | Modifying C++ files of Quick tests had been ignored as they normally have little impact. But nevertheless this behavior is wrong and could lead to unexpected behavior later on if no complete rescan had been done and even with a rescan there could have been some cached artifacts. Fix this by tracking the paths of the C++ files that hold the main() or the respective macro to be able to handle changes of these files correctly as well. Task-number: QTCREATORBUG-20746 Change-Id: Iec860aa63ffd167511efdbf63a6ffa369f094edf Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: only add Tasks from the main threadDavid Schulz2018-07-114-60/+89
| | | | | | | | | | | If something fails while extracting the build env from msvc vavars scripts we want to add task hub entries to inform the user about a most probably unusable toolchain. As the msvc toolchain detection is threaded nowadays and the TaskHub is not thread safe we need to propagate the error message to the main thread before adding the Task entries. Change-Id: I5c67d3b8d58b22ea895afb6f22ee73f19fa52f17 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Follow symlinks in Environment::isSameExecutableOrgad Shaneh2018-07-111-1/+5
| | | | | | | | | If qmake uses /usr/bin/gcc and the kit is configured to use /usr/bin/gcc-7, and both reference the same executable, there is no reason to warn. Change-Id: Ida79fccb97cffb682c1d85d7fa8888d85bf7d6a4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* use initializer listTim Jenssen2018-07-101-1/+1
| | | | | Change-Id: I15fdcf313db913df91a1a93684e1d60de7bf16bd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* WinRT: set symbol file before debugging winrt packagesDavid Schulz2018-07-101-0/+1
| | | | | Change-Id: Ic3224cd1f12e799a9b38f31ba6dfe04c7774e35f Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Fix handling of the QTC_USER_FILE_PATH variableFriedemann Kleint2018-07-101-5/+4
| | | | | | | | Add a quick check whether the variable is set and return nullopt in that case. Flip the check in the below code. Change-Id: I655662f2940946150165107a66c003a3a4bc025d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix running lrelease and lupdate as external toolsEike Ziller2018-07-102-0/+2
| | | | | | | | | | | With newer Qt versions. These want to run cl.exe on Windows, which usually is not on the PATH except for the build environment. So, use the current build environment's PATH if that is available (falling back to the system environment's PATH). Task-number: QTCREATORBUG-19892 Change-Id: Ia512b3599d2cca7a0d1169b0d673f32158cb701f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Add %{CurrentBuild:Env} to global environmentEike Ziller2018-07-101-0/+7
| | | | | | | | %{CurrentBuild:Name} and %{CurrentBuild:Type} are there too. Change-Id: I06b49da61cd689b54be87333d7fa3f212ebf1762 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Expand variables in external tool environmentEike Ziller2018-07-101-1/+6
| | | | | Change-Id: I98fc942f25309bba1b4573b0544418d3b4b836c8 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Show 4 columns of examples within Qt Creator's default window widthEike Ziller2018-07-101-2/+2
| | | | | | | | | By reducing the width of the individual items. Otherwise first startup looks a bit stupid with a large empty column to the right. Change-Id: Iff7fa343a5c36181f09e1e3c18307dc55bd11abc Reviewed-by: hjk <hjk@qt.io>
* Android: Fix aapt tool's path in windowsVikas Pachdha2018-07-101-1/+1
| | | | | | Task-number: QTCREATORBUG-20750 Change-Id: Ie35675d789007a6c79b979b4520dc0ecc83c688c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Qml Debugger: Disallow editing of items with childrenUlf Hermann2018-07-091-6/+12
| | | | | | | | | | | The debugger will treat any value you put in there as string, and then fail to update the item because it doesn't expect the type to change. Proper editing of JavaScript objects requires quite a bit more UI than this, so disallow it for now. Task-number: QTCREATORBUG-20736 Change-Id: I7bf6e7a3747cde3c6682b66aaa810291f753e85d Reviewed-by: hjk <hjk@qt.io>
* QML Debugger: Make sure to re-fetch expanded properties on updateUlf Hermann2018-07-091-1/+4
| | | | | | | | | | | | If an expanded object is updated we typically just get the ref for it. If we leave the tree item at "wantsChildren", the debugger will think that the update fails and "adjust" the "child expectation" to none. Fetching the children right away takes care of this. Task-number: QTCREATORBUG-20736 Change-Id: I1b3725e7106a563198962915cbcab8f68ef741a6 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Show examples page in welcome mode on first startEike Ziller2018-07-091-2/+6
| | | | | | | | | This change might help first-time users getting started. Task-number: QTCREATORBUG-20674 Change-Id: If55402160bf6b1515142bb64f281654fe4c68134 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Fix crash when filtering out warnings from issues paneEike Ziller2018-07-092-1/+7
| | | | | | | | | Do not send endRemoveRows if we never sent beginRemoveRows. Fix up of 702d6a69148091b23023aeafdb697919dff1a1d6 Task-number: QTCREATORBUG-20741 Change-Id: If22a18e6426c8b4041924a170d5927ab9d11ccdf Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: Silence managesFileOrgad Shaneh2018-07-091-1/+2
| | | | | | | | When adding existing untracked files to a project, and choosing to add them to Git, error messages appeared in the output pane. Change-Id: Iba639a678d2ca424fb32b34b218fca1c4b99971d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Clang: For definitions show their parent class qualificationIvan Donchevskii2018-07-091-1/+16
| | | | | | | | | | | | | | | | | | | | | Append methods and class members with the scope they belong to extracting the parent name. It was like that in old code model. Example: namespace Foo { void Bar::function() {} } Old result: Foo function() -> void New result: Foo Bar::function() -> void Change-Id: I9dad86a6738baafb1a210c5e1146d8de33828c44 Reviewed-by: David Schulz <david.schulz@qt.io>
* Clang: Don't show template type parameters in Class View and Current ↵Ivan Donchevskii2018-07-095-2/+19
| | | | | | | | | | Document filter They do not bring any value. Task-number: QTCREATORBUG-20716 Change-Id: I2876f0e1e3918cb33d133b4a65ccaefd9bd30ac8 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Parse APK to find package name and other informationVikas Pachdha2018-07-094-1/+89
| | | | | | Task-number: QDS-16 Change-Id: I228af0711fb2dd64ff96dcb5fc9bc634b556ffd9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Android: Add API's to run Android SDK toolsVikas Pachdha2018-07-092-17/+37
| | | | | | Task-number: QDS-16 Change-Id: Ifea5aa17330833cd130555778134fb8f90e2d990 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlDesigner: Fix crash when opening qmlproject while Design mode is openEike Ziller2018-07-061-4/+7
| | | | | | | | | | | | | | Fix the order of signal handling, which was changed in a5935cb27a0609764586302bf109796d74060f3d but leads to this crash. The connection to the DesignMode instance still needs to be delayed to after it has been created in Core plugin's extensionsInitialized, so do the final initialization as a reaction to ICore::coreAboutToOpen. Task-number: QTCREATORBUG-20495 Change-Id: I92d9a4ff689d2f191d2fd368966ca582bf8af2f7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Debugger: Robustify MainWindow state savinghjk2018-07-062-1/+2
| | | | | | | | Save the state before child widgets are affected. Task-number: QTCREATORBUG-20721 Change-Id: I1d0d1ca610b0a8e8904585953ecbb42dddee4827 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update qbs submoduleChristian Kandeler2018-07-061-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: I06fb4bfcf1b7affd6cb1ca6fbf0c39e886e4d27c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: Use ipv4 host to connect to app in androidVikas Pachdha2018-07-063-3/+8
| | | | | | | | | | | IPv6 enabled systems can have IPv4 and an IPv6 entry for localhost and macos seems to prefer IPv6 for localhost and IPv6 is not supported by adbd Task-number: QTCREATORBUG-20730 Change-Id: Ia0823fa04581afc6297e5e8d57a8034ba1b5749c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ProjectExplorer: Search for clang-cl compiler in pathIvan Donchevskii2018-07-051-17/+34
| | | | | | | | Currently we only check if it's in the registry which is not the case when you have a custom build. Change-Id: I20ec25378d16996f790726ed14238861bc220004 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QMake parsing: Improve behavior in case of empty build directoryv4.7.0-rc1Eike Ziller2018-07-041-3/+6
| | | | | | | | | | | | | | | | | | | | | The build directory can be "empty" if there is no build configuration, or if the build configuration's build directory is empty. Handle both cases in the same way. This avoids passing an actually empty build directory to the parser, which the parser does no longer handles gracefully on Windows. If the build directory is empty, use the project's source path (instead of QDir(QString()) which is the current working directory), which makes it consistent with the behavior when actually building in that case. The parser does not actually write files to disk, so there is no issue with temporarily using that directory and later switching to a shadow build directory. Task-number: QTCREATORBUG-20121 Change-Id: Ia454085edae6b55b445cc5cf0ec3ae1c85464b0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Beautifier: Long live uncrustifyLorenz Haas2018-07-041-0/+2
| | | | | | | By accident uncrustify's option page got kicked during a refactoring. This amends 9a7e7f7d4. Change-Id: I27aba7bcf689b20763446fd445f4855050669865 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlDesigner: Reparent only on CTRL+SHIFTThomas Hartmann2018-07-041-0/+1
| | | | | | | | | | | | | | | | Shift is a common modifier and we should use it to limit changes to one axis (e.g. x), since this is a useful and typical usage. We moved reparenting to CTRL+SHIFT. It has issues and can trigger crashes. Still it can useful and it is unlikely to be triggered randomly/by accident on this shortcut. Task-number: QDS-7 Change-Id: Ieeac6323659d5bd95bd27a05b8e18808ecdf390b Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: Fix state of instruction wise operation buttonChristian Stenger2018-07-041-0/+1
| | | | | | | Task-number: QTCREATORBUG-20714 Change-Id: Ie45fcb288a5e6a566a38b35d375b703c9c5a2326 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Stabilize property order of meta dataThomas Hartmann2018-07-031-3/+10
| | | | | | | | This reduces noise in the source control system. Task-number: QTCREATORBUG-20686 Change-Id: Icf7d0d5b1af288f3518594233086917f039a47a0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix crashThomas Hartmann2018-07-031-6/+12
| | | | | | | | | | | | This does not fix the bug altogether, but if escaped quotes inside translatable strings are required, then those can be done in the text editor. The crash is turned into an error message. Task-number: QTCREATORBUG-20684 Change-Id: I702628fbe888450a27c07166d5adacde37b5d1e1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: Do not switch to design mode when hitting a break pointUlf Hermann2018-07-031-2/+4
| | | | | | | Change-Id: I2b31aa78a707ca830382095f20d33439caa830ac Task-number: QTCREATORBUG-20712 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* VCS: Fix off-by-one line in blameOrgad Shaneh2018-07-021-4/+4
| | | | | | | | Line is blockNumber()+1. When executing blame, the cursor jumps to one line above the selected line. Change-Id: Ia28b6c5a353ee979fae3f463b864d1409d9649cd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2018-07-025-846/+3343
| | | | | | Change-Id: I81891762ceb44c7329a75e6d982532419102a232 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GenericHighlighter: Support WordDetectOrgad Shaneh2018-07-024-2/+40
| | | | | | | | | | | | Added in Kate 3.5 (KDE 4.5). Similar to StringDetect, but only matches whole word (\b<string>\b) Already used in some of the built-in highlighters. Change-Id: I03ae5e1db917e777a21bb96d9a31cc7771287f39 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2018-07-021-0/+0
| | | | | | | TO HEAD of 1.12 branch. Change-Id: I7308b718af0baf95b931183a686ac034609c9433 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix issues with saving files on network drives on WindowsEike Ziller2018-06-291-1/+1
| | | | | | | | | | | In these cases the user might not have sufficient rights for ReplaceFile to merge all file attributes and ACLs. Make ReplaceFile ignore these errors. Task-number: QTCREATORBUG-20560 Change-Id: I6980d8af66cb7200c39726f0e7273df83c99bf5c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>