aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix documentation build when renaming IDEEike Ziller2018-07-041-2/+2
| | | | | | | | | | | | | | Do not rename documentation qhp file. The documentation qmake files currently depend on the files having the same base name as the qdocconf file. Also do not change the documentation namespace. There are places where these are mentioned in translated strings. Fixup of 54208113eee147b29a7a7c4df96365569890fd56 Change-Id: Iace171535ea5be6e22fec9760a5d96722b052341 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* 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>
* qmljs: Add autocompletion for QtWebEngine importsKai Koehne2018-07-041-0/+8
| | | | | | Task-number: QTCREATORBUG-20723 Change-Id: Id7e6700e87b73c845a0dda6152731085eaf5fcf1 Reviewed-by: Marco Benelli <marco.benelli@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>
* Doc: Pull out "Adding States" into a separate topicLeena Miettinen2018-07-035-67/+92
| | | | | | | To further modularize the Manual. Change-Id: I9b51ce951b92ff6690780de3d9f08f436169150d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Add information about connectionsLeena Miettinen2018-07-036-143/+309
| | | | | | | Divide the subtopics into individual topics. Change-Id: If32ada04e9f305cf9a2e3a03072026eac92d005a Reviewed-by: Thomas Hartmann <thomas.hartmann@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>
* Tests: Add lines for testing editing and output of intRobert Loehning2018-07-031-0/+2
| | | | | Change-Id: If31b5957fa55f5dd31205a0b4495491314fa87c0 Reviewed-by: Christian Stenger <christian.stenger@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>
* Dumper: Fix detection of Qt namespaceChristian Stenger2018-07-021-1/+1
| | | | | | Task-number: QTCREATORBUG-19620 Change-Id: Icca654714b70c69522b51998be21cff80bc29fac Reviewed-by: hjk <hjk@qt.io>
* Squish: Fix for Qt 5.11Robert Loehning2018-07-021-1/+1
| | | | | | | | The items in the treeView look slightly different than with Qt 5.10 and thus seem to lose the mouseclicks. Change-Id: Ibee1abdbc9e9bfe622b45f76ed5e612e81fd1770 Reviewed-by: Christian Stenger <christian.stenger@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>
* Doc: Fix link targetChristian Stenger2018-07-021-1/+1
| | | | | | | Name of target file has changed. Change-Id: I5e80fdeab00d09671bf7be20a647117c894f8165 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Update Russian translationSergey Belyashov2018-06-291-1454/+1704
| | | | | | | Change-Id: I13737f490a7e4b46319fcae99f641a9bc8538184 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* Squish: Fix expected targets for widget app wizardChristian Stenger2018-06-291-3/+1
| | | | | | | | Reverts cd45ce5f391c. Change-Id: I6865e6c91fd961ac36da160a01c676f5274c40cc Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Handle more server side issuesChristian Stenger2018-06-291-3/+28
| | | | | | | | | If we get correct http responses that point to server side issues handle them appropriate if possible to let the test continue instead of crash. Change-Id: I7d2e8848269600762e9c7fe980414c4f7106433c Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Clang: Don't analyze same file multiple timesIvan Donchevskii2018-06-284-7/+19
| | | | | | | | | | Diagnostics do not depend much on project parts. But having the same file twice can result in duplicated diagnostics which later can cause the same fix-it being applied twice and getting corrupted code. Change-Id: Ie2809af7a54034b05df9383875f7c3123aea58e8 Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix inserting tasks into issues paneEike Ziller2018-06-281-7/+9
| | | | | | | | | | | | | When tasks are inserted into the source model, the source indices in the filtered model after the new items where not updated correctly. The indices must be increased by the number of items added to the source model, not the number of items added to the filtered model (which can be less). Task-number: QTCREATORBUG-20542 Task-number: QTCREATORBUG-18951 Change-Id: Idae9cf4241c31229dadf5c9fea383aef3fdfffb0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TaskModel: Bit of code cleanupEike Ziller2018-06-282-18/+20
| | | | | | | | | | Do not send rowsRemoved before source model has removed the rows from its data. Add some QTC_ASSERTS and comments. Replace trivial slot by lambda. Change-Id: I7a0df404f757fca5f7724be66e516824ecd292dd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* WinDebugInterface: Remove blocking connection to main threadJoerg Bornemann2018-06-283-34/+72
| | | | | | | | | | | | | | | | | | | | | | | The debugOutput() signal was connected via BlockingQueuedConnection and blocks the WinDebugInterface thread until the signal is received. If we signal "buffer ready" afterwards, all OutputDebugString calls (of all processes of the system) that wait for "buffer ready" also wait for our internal signal delivery. This can lead to hangs in circumstances where the event loop is currently unable to deliver the signal. Remove the blocking queued connection, and introduce an internal _q_debugOutputReady() signal that is emitted whenever new debug output is available. This signal is queued-connected to a dispatchDebugOutput function, which is running in the main thread. That function retrieves the data from the WinDebugInterfaceThread and emits debugOutput(qint64, QString). This massively reduces the event queue load without blocking the WinDebugInterface thread. Task-number: QTCREATORBUG-20640 Change-Id: I91f8f794af8da2a695c2b897f678844b142a5991 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Properly apply fix-its from header filesIvan Donchevskii2018-06-283-24/+31
| | | | | | | | | Diagnostic may also include fix-its for the header which require different handling. Task-number: QTCREATORBUG-20517 Change-Id: I3e745622801be3fa2856d968b0c7a2a2aeb89b50 Reviewed-by: David Schulz <david.schulz@qt.io>
* Clang: Fix comma-separated class members in symbol outlineIvan Donchevskii2018-06-281-0/+4
| | | | | | | | | Check for the actual lexical parent in addition to ranges. Task-number: QTCREATORBUG-20656 Change-Id: Ie2ead5cd02e83f9fd201825ee80d1633679a6402 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CppTools: Fix getting locator filters from the object poolIvan Donchevskii2018-06-285-8/+49
| | | | | | | | | They are no longer inside the global object pool. Get them from CppModelManager instead. Task-number: QTCREATORBUG-20678 Change-Id: Ifb3221a812295e1dcfe8b59ea693a4b350cbcc2e Reviewed-by: David Schulz <david.schulz@qt.io>
* Clang: Fix Q_PROPERTY return typeIvan Donchevskii2018-06-281-7/+0
| | | | | | | Check for the Clang macro was not removed here. Change-Id: I5b6c6d971e892fd02ef21935e2a8766d9f0d6d5d Reviewed-by: David Schulz <david.schulz@qt.io>
* Doc: Add a link to Acknowledgements to the front pageLeena Miettinen2018-06-281-0/+3
| | | | | Change-Id: I405ceb8a4490c94c5ad695f06fb902c0a3f154a2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Fix replaceSubtree for project nodesChristian Stenger2018-06-271-1/+3
| | | | | | | | Ensure to keep node alive as long as needed. Task-number: QTCREATORBUG-20616 Change-Id: I57a720d3e31e14bcb8388de5fef68f70db370c90 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Clang: Avoid using -isystem include pathsNikolai Kosjar2018-06-274-40/+10
| | | | | | | | | | | | | | | | ...as this leads to file locking issues on Windows and pointless diagnostics we currently ignore when opening files from -isystem include paths. The usage of -isystem suppressed warnings from system headers and resulted in a performance boost. Nowadays we can preserve this performance optimization by making use of the new CXTranslationUnit_IgnoreWarningsFromIncludedFiles. This flag helps us also to suppress diagnostics from clang tidy checks, which reported diagnostics even for -isystem headers. Change-Id: I33e1f7169e2ff9f17c811565a5324b9da4740701 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Doc: Add a link to contributor list to the Acknowledgements pageLeena Miettinen2018-06-271-0/+6
| | | | | | Task-number: QTCREATORBUG-20683 Change-Id: I9d2debac7badda999e129ca1b5d3d04923642f91 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Utils: Separate the filter icon from the expand arrowAlessandro Portale2018-06-278-9/+29
| | | | | | | ...so that the filter funnel can be used stand-alone Change-Id: Ic8675954edd4234f84de8caffedd1a67b67b2edd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* WinRt: restrict WinRt deployment steps to WinRt devicesDavid Schulz2018-06-271-0/+3
| | | | | | Task-number: QTCREATORBUG-20647 Change-Id: I8bc4cf8b4cce66f062ef7523f5c0cdeef759ea9d Reviewed-by: hjk <hjk@qt.io>
* VcsCommand: Block auto reload while a command is runningOrgad Shaneh2018-06-275-1/+22
| | | | | | | | | | | | | Git rebase is executed in the background, and it can change a file multiple times in a short period. If we reparse a file while this happens on Windows, Git fails to replace it, the rebase action fails and the repository becomes unstable (remains with a modified file). See discussion at https://github.com/git-for-windows/git/pull/1666 Task-number: QTCREATORBUG-15449 Change-Id: Iba40a770a1df2dfff0dd1c874c491dfbe1cceb58 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use C++11’s override and remove virtual where applicableAlessandro Portale2018-06-276-13/+13
| | | | | | | | Fixes warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [modernize-use-override] Change-Id: I4b8b8ecce028dfd051fe14984b40115e92057a40 Reviewed-by: hjk <hjk@qt.io>
* Squish: Remove Qt4 from expected kits for widget application wizardChristian Stenger2018-06-261-0/+2
| | | | | Change-Id: I747b47a5adb684f9ef3c245427707ead9ffba20a Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Squish: Add VS2017 as expected compiler on WindowsChristian Stenger2018-06-261-0/+1
| | | | | Change-Id: If68d6a143f4c1f9b96fe7c561977ab481a31ecb4 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* qmljs: Use C++11’s override and remove virtual where applicableAlessandro Portale2018-06-264-121/+121
| | | | | | | | Fixes warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [modernize-use-override] Change-Id: I17955fd0fdb052678228f1bda32cd8d3b4298998 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* FancyTabWidget: Set focus on widget changeOrgad Shaneh2018-06-261-0/+7
| | | | | | | | If the locator popup is open, and the user changes mode using the keyboard (Ctrl+num), the popup was not closed. Change-Id: I7d5cb93229715dd293b6eb4d36cf2a9cb4467123 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: Fix crashOrgad Shaneh2018-06-261-1/+3
| | | | | | | Happens when closing an editor while tooltip processing is in progress. Change-Id: I023f62ab6ba1e8b1bbe207da08c1e526fb99430a Reviewed-by: David Schulz <david.schulz@qt.io>
* Bump to 4.7-rc1Eike Ziller2018-06-262-7/+7
| | | | | Change-Id: I071ef81b3285102eeedba7d475aabfda762926d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AutoTest: Fix finding corresponding item for data tagsChristian Stenger2018-06-261-1/+2
| | | | | Change-Id: I95518b69f0a60206a45318586d7ba033d101d1d6 Reviewed-by: David Schulz <david.schulz@qt.io>
* Doc: Replace "Qt Quick Designer" with "Design mode" or \QMLDLeena Miettinen2018-06-2520-92/+104
| | | | | | | To make source text usable also for Qt Design Studio manual. Change-Id: I7a5090ea2308a3091c34193cce3a8b57da1eb498 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Make info about managing projects more genericLeena Miettinen2018-06-252-15/+13
| | | | | | | The details are described in the listed topics. Change-Id: I243eb8dc102ef42030a1a2e1b28af2679e6ca631 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizard: Ensure compilable widget application templateChristian Stenger2018-06-251-0/+1
| | | | | | | | | | The used template code is nowadays C++11 specific and this is not default before Qt5.6. Explicitly enable C++11 to make the generated project compile out of the box for all Qt5 versions. Change-Id: I720126b13bfc0d3da960438df1a1106c5574053f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectWelcomePage: Do not open project on right clickhjk2018-06-251-17/+25
| | | | | | | | And neither sessions; in that case pop up the mini menu, too. Change-Id: Iea5ed023ab477f4f1e526aa36f9b27f42881b052 Task-number: QTCREATORBUG-20487 Reviewed-by: Eike Ziller <eike.ziller@qt.io>