summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adapt Qbs submodule URL4.4Eike Ziller2017-12-121-1/+1
| | | | | | | | | | | It moves to qbs/qbs Developers need to run git submodule sync on existing checkouts once, to fetch the new URL Change-Id: I9d526a0df6f4a3fad56e6998880455e003e96d9a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Update Polish translationsJarek Kobus2017-10-131-979/+1529
| | | | | Change-Id: I90b81cec2308a148206e3cd6ec50a8f73ec9f667 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* QmlDesigner: Fix missing includeChristian Stenger2017-10-111-0/+2
| | | | | | | Change-Id: Ic445036d3ab6f0b673d8541322c0631ced0aeb91 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 8b32ff9343de80b61ce4c7dc29b787a246f263b5) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix compile with Qt 5.10Thomas Hartmann2017-10-112-1/+3
| | | | | | | | The QtQuick include at this point for some reasons tries to include not existing Vulcan headers. Change-Id: Ie2dc667b3438a2bbf7e8f251520502a836b109db Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: Disable block selection if file was changed in other editorv4.4.1Serhii Moroz2017-10-021-0/+5
| | | | | | Task-number: QTCREATORBUG-18770 Change-Id: Iccdc3deb354599bf1fd6f1cb8c0d5a1765ecb471 Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2017-10-021-0/+0
| | | | | | | To HEAD of 1.9 branch. Change-Id: I90a37855cd405423ef02dc27be563b822ad96bd3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qnx: Fix C++ debugginghjk2017-09-292-2/+4
| | | | | | Task-number: QTCREATORBUG-17901 Change-Id: Iab7dfa3eb9a211770e45405f344d75ff20e8acae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* More changelogEike Ziller2017-09-291-0/+2
| | | | | Change-Id: Ic0064a21bf080ddc4803bcbbe92d0dab29d765d9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qnx: Fix Qml profiler startuphjk2017-09-292-50/+32
| | | | | | | | | | | | | This essentially replicates the RemoteLinux setup with the additional Slog2Info runner. Verified to work with Qt 5.9.2 on a BD-SL i.MX6Q_Sabre-Lite_Board armle running QNX 6.6.0 2014/02/22-19:07:53EST Task-number: QTCREATORBUG-18954 Change-Id: Iffea289b7c7f25d23472c9e12b5e45c460c93795 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add changes file for 4.4.1Eike Ziller2017-09-291-0/+64
| | | | | Change-Id: Icca756e45af941b0d6fe320ebc06183e27c01f02 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Fix the SDK platforms parsing for SDK tools 26.1.1Vikas Pachdha2017-09-281-2/+4
| | | | | | Task-number: QTCREATORBUG-18962 Change-Id: I780193be482ebc151931196792068d7c4d1ad808 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* GLSL: Avoid infinite loop at error recoveryNikolai Kosjar2017-09-282-323/+353
| | | | | | | | | | | | | | | | | | | | | | For error recovery additional tokens are tried to produce a valid grammar rule. For the specific case in the bug report for(int x=0; x y the two consecutive identifiers in the end triggered an infinite loop since the identifier token is also part of those additional tokens that are tried. Circumvent this by trying a more conservative list of tokens on the second try. Done-by: Erik Verbruggen Change-Id: I271dddecf947a06ed3af5f9955ee630441533342 Task-number: QTCREATORBUG-18967 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* GLSL: Fix conversion warnings on WindowsNikolai Kosjar2017-09-283-14/+14
| | | | | | | | | | | | | | This was actually already fixed with Fix compiler warnings on windows. commit cc04b84917ef0f90e2017bf652b7327ce5edda9c. However, glslparser.{h,cpp} were changed, which are generated from glsl.g. Fix the warnings in the source file glsl.g so the next time the parser is re-generated the changes are not lost. Change-Id: If7e5f45ff1a93d1d7b6c9213697884f5a7e9ec5f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* GLSL: Re-generate parserNikolai Kosjar2017-09-284-1767/+1790
| | | | | | | | | ...by running ./make-parser.sh to make a subsequent change less noisy. qlalr in PATH is from Qt 5.9.1. Change-Id: Ia39181b55cd0e16207fa809f0db92cdeba3b095c Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* QbsProjectManager: Respect overridden target ABIChristian Kandeler2017-09-272-0/+5
| | | | | | | | | Auto-detecting the architecture in qbs is all well and good, but if the user explicitly set an ABI in the toolchain widget, we must set qbs.architecture accordingly. Change-Id: I3a2c441ceea5e939e43764e0468588d2d0ef323c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Dumpers: Quit test immediately if make failsOrgad Shaneh2017-09-271-0/+1
| | | | | | Change-Id: Idee48a997dce047e5ad90d133fce9c610f609a9a Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Dumpers: Fix tests execution on Windows/MinGWOrgad Shaneh2017-09-271-9/+12
| | | | | Change-Id: Ie6207f5edba865e880249d6f70daf1e9c72c4163 Reviewed-by: hjk <hjk@qt.io>
* Dumpers: Modernize testsOrgad Shaneh2017-09-271-45/+38
| | | | | | | | * Remove QLatin1* * foreach -> for Change-Id: Ifac9b14b9904df8d112c71f791f1e0bd45ffc584 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix qbs build for qbs >= 1.10Christian Kandeler2017-09-261-0/+2
| | | | | | | | Shadowing modules does no longer work from qbs 1.10 on; we need to give our implementation of qbsbuildconfig a higher priority. Change-Id: I703b780d564c43ebc2a4318f683537f10c4e5f3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Dev package: Include .hpp filesEike Ziller2017-09-261-0/+1
| | | | | | | Like optional.hpp Change-Id: I1cc804834f34982dedfae0597179e523ff3bf522 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* BareMetal: Fix target file name resolvingOrgad Shaneh2017-09-262-8/+6
| | | | | | | | | | | Broke by 1acd9d30dc68fd2b1690a54e2bdc278dfd46cceb. Change-Id: I0dbf14aeb345743eb22a033ac3570c6af4eb0bb2 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix unstoppable debuggerFilipe Azevedo2017-09-202-4/+4
| | | | | | | | | | For some reason sometimes a user stop request with lldb can trigger a spontaneous stop, avoiding the debugger to stop correctly. This change fix the issue by emitting the correct states from lldbbridge.py. Change-Id: Ib8a2f4875824f4fff426b2d5e0fc4a79ce48c68e Reviewed-by: hjk <hjk@qt.io>
* C++: Fix crash with invalid raw string literalNikolai Kosjar2017-09-203-6/+31
| | | | | | | | | | | | | | | | While parsing a document Bind::asStringLiteral() Token::spell() was called for a raw string literal token with a Token::literal nullptr. This is due scanRawStringLiteral() not properly aborting for invalid/incomplete code and that the code paths handling multi-line-raw-strings were not limited to the highlighting case. Address both cases. Task-number: QTCREATORBUG-18941 Change-Id: I489d288ccbd7b59be396dada846613ff555436cf Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TextEditor: Fix blockSelection painting in "Text Wrapping" modeSerhii Moroz2017-09-191-1/+0
| | | | | | Change-Id: I1ba4587ce4f8e88a1c81c5ac3c9d6dac582bd71f Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Dumpers: Print readable output in testsOrgad Shaneh2017-09-191-10/+10
| | | | | Change-Id: I32864c9c1b8fe60b5b01423f68e63a3c00b936f8 Reviewed-by: hjk <hjk@qt.io>
* Revert "SearchResultWidget: Disable replace button if replace text is unchanged"Andre Hartmann2017-09-192-15/+2
| | | | | | | | | | | | | The Refactor -> Convert to Camel Case quickfix calls setReplacementText() with the replacement text already, in contrast to the other search and refactoring functions, which pass the search text. Therefore, the replace button is disabled wrongly in that case. This reverts commit e75f5958737f3a302508d3e72aed4e4672a43557. Task-number: QTCREATORBUG-18947 Change-Id: I906a58f65a88cce42d2da6431e59b88fae4ec45a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Enclose code model tests in sectionsRobert Loehning2017-09-1910-307/+326
| | | | | Change-Id: I4478acfc5ea7b3fa22d1cd17576e04fdda81dbb9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Dumper: Dump CHAR/WCHAR arrays as stringsOrgad Shaneh2017-09-182-7/+20
| | | | | Change-Id: I78bdb181e27cc858356c9026fc960135b54cdcbb Reviewed-by: hjk <hjk@qt.io>
* Debugger: Don't second guess on run in terminal settinghjk2017-09-151-0/+2
| | | | | | Task-number: QTCREATORBUG-18912 Change-Id: Id6ded1b7df03273048e118e5679f288b21066667 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: Fix auto-detection on WindowsOrgad Shaneh2017-09-141-2/+8
| | | | | | | Recent CMake installer (3.9) installs the executable in CMake/bin. Change-Id: I3912badc0907c91044e76b3155e924dd985819f1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CPlusPlus: Avoid nullptr accessNikolai Kosjar2017-09-131-1/+5
| | | | | | | Task-number: QTCREATORBUG-18903 Change-Id: I852b5de453d44c16adffd44c89900cfb8c3cc522 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlDesigner: Change selection in the release eventThomas Hartmann2017-09-131-7/+6
| | | | | | | | | | | | We already change the selection currently in the press event, which leads wo weird behaivour if e.g. shift is pressed. In this case the item is immediately unselected which is unexpected and cannot be moved anymore. Generally reacting to the event in the release event is the correct way to do it. Change-Id: Ib765f97f85e5dbeb6148d48f8640f1798a057b48 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix shift modifer in layout caseThomas Hartmann2017-09-133-4/+10
| | | | | | | | | | | The move tool normally does not reparent, but by pressing shift the user can enforce reparenting. In the drag tool we prefer to reparent to layouts. The shoft modifer disables this heuristic. Task-number: QTCREATORBUG-18737 Change-Id: Ic8041aed537619b16b892a791c0d2bc2390af204 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: Add to solib-search-path, don't replace ithjk2017-09-132-3/+11
| | | | | | Task-number: QTCREATORBUG-18812 Change-Id: I0fb8d81d55e9928bd3825c510a11ab426ec082c6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Replace -x with -- for gnome-terminalOrgad Shaneh2017-09-121-1/+1
| | | | | | | | | -x is deprecated. Change-Id: Ic00b8042caff1620abe3e51f9d3b3198d606f084 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Squish: Update expected tree for tst_cmake_speedcrunchRobert Loehning2017-09-121-2/+0
| | | | | | | | Needed since 3bb3f4af56b538dbf70a907f2ca5d633f8379608 filters out duplicates. Change-Id: If7e56914feb9d22c1620822fbb363b55b894a41a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectTree: Handle containerNode in ProjectTree::hasNodeTobias Hunger2017-09-121-1/+3
| | | | | | | | | This fixes e.g. "Add Existing Files..." triggered on the top-level node of a project. Task-number: QTCREATORBUG-18896 Change-Id: I763e9a31edbcfd8ac9a4f8b8b30ef885789ad1a5 Reviewed-by: hjk <hjk@qt.io>
* Squish: Update language testChristian Stenger2017-09-121-0/+2
| | | | | | | | Danish and Ukrainian had been added a while ago, so add them to the list of languages to check. Change-Id: I92c507e3a567efa39d7295559af0fb16bbcd1bb6 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Fix Get Started Now (and other links)Eike Ziller2017-09-121-1/+11
| | | | | | | | | | | | | | | If we do not specify the correct documentation URL including the version number, QtHelp will look for any documentation that has the given path. Since we now register Qbs documentation, and that also has a file "doc/index.html", the Get Started Now button could open the Qbs manual instead of the Qt Creator one. Specify the full documentation URL including version number to ensure that QtHelp opens the right page. Change-Id: Ia77103fe2763dd208d3b9a279a8301f7f5799c8b Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Avoid waiting plugin side if (re)parse failsNikolai Kosjar2017-09-125-3/+114
| | | | | | | | | | | | | | | | | | If a parse or reparse operation fails, the corresponding translation unit is "not intact" anymore and further job requests for that translation unit will be silently discarded without notifying the plugin. This is especially problematic when the plugin expects/waits (for) a certain message. A parse/reparse can fail due to e.g. an invalid commandline or an internal crash. In such a case, ensure to send some dummy results. Task-number: QTCREATORBUG-18864 Change-Id: Ida9b8066fd55e64027a9b0d8bd5cf365b16a7356 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AutoTest: Fix test result output when debugging testsClaus Steuer2017-09-121-1/+1
| | | | | | | | | | | When executing tests in debug mode the results are not displayed as usual in the test result pane. In debug mode a newline character is added to each line before passing it to the outputreader. The regular expressions used in the GTest- and QtTestOutputReader do not match because of the newline character. Change-Id: Ia8051497097c950b5cf2d64cd4de0cb425802c50 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update danish (da) translation for Qt Creator 4.4scootergrisen2017-09-111-5499/+9242
| | | | | Change-Id: I83d612efb8cddfb98961901efbf8bc6832b43682 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Clang: Output warnings if QIODevice::write() failsNikolai Kosjar2017-09-111-1/+3
| | | | | Change-Id: I9588a5081d8adb7b2db7955c4f48a2391e202396 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* PushToGerrit: Fix support for multiple projects on the same remoteOrgad Shaneh2017-09-113-4/+13
| | | | | | | | | Use case: A project has a legacy repo and a new repo. Both are used as remotes in the same local directory. If the legacy repo's remote name is less than the current repo (legacy < origin) then only legacy appears. Change-Id: Ie02cbee3142c4d2628cb51cbcad50cf903a75bb0 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* FakeVim: Properly recognize tabp...tabprevioushjk2017-09-111-3/+3
| | | | | | | | | | | Note that this does not fully solve the linked issue as the triggered GOTOPREVINHISTORY action does not have the same behavior as :tabprevious Task-number: QTCREATORBUG-18843 Change-Id: I26a719f77d2c1727bb18da46e13f5a0be48473bc Reviewed-by: Lukas Holecek <hluk@email.cz> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* C++: Fix highlighting of "float" keyword for C filesAndre Hartmann2017-09-111-2/+2
| | | | | | | | | | | | ... in the Classic Code Model. Broken by 0d1fef41f76c04ede629406b6d15847c453f6d96 Task-number: QTCREATORBUG-18879 Change-Id: I7d0222cc81e8847827af042e89d3b75c57f5d454 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Squish: Update expected combo box in tst_WELP01Robert Loehning2017-09-081-1/+1
| | | | | Change-Id: I35f40a637a6914bea2057b951409b21b7ce90c8d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake: Filter out CMake input files that are already listedTobias Hunger2017-09-081-8/+25
| | | | | | | | Filter out CMake input files that are already listed elsewhere in the project tree. This is server-mode only. Change-Id: Ib62cd5b521a51180d12d76ec2868a99dbdecc272 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Doc: Add links to Qt Creator Application Manager Plugin ManualLeena Miettinen2017-09-082-0/+14
| | | | | Change-Id: I1333652a41ff831ae5a7b84dc56041afc074cd60 Reviewed-by: hjk <hjk@qt.io>
* Squish: Workaround Squish issues when using nativeTypeChristian Stenger2017-09-072-5/+9
| | | | | | | | | | | | When using nativeType() Squish sends single key press events for any char to type. nativeType() does not wait until these events have been processed which leads to complete useless time measurings inside tst_tasks_handling as timestamps are taken too early if nativeType had to be used - which happens when a native FileDialog is used. Change-Id: I446de898fd99b2e169ca39bef1adb4306d6ee530 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
View Lorry Controller Status