summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Debugger: Do a hard shutdown when QML debugger is stoppedv4.1.0-rc1Ulf Hermann2016-08-031-1/+1
| | | | | | | | | | There is no point in trying to "gracefully" shutdown by waiting for the application to hit the next line of JavaScript. The application might never execute any more JavaScript. Change-Id: Id531a2b23ce9aa12462e308f29106f8cefa67092 Task-number: QTCREATORBUG-16709 Reviewed-by: hjk <hjk@qt.io>
* Doc: Introduce a macro \macos to adapt to upcoming renamingshjk2016-08-0328-82/+83
| | | | | | | | | Start with an initial value 'macOS' and use in uncontroversial places in the docs. Some explicit references to older versions are untouched in this patch. Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Update CPU Usage Analyzer screenshotLeena Miettinen2016-08-031-0/+0
| | | | | Change-Id: Ibe48b0a571f10007e5f1078f4349916c2d91a6e7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Debugger: Fix empty memory when viewing inaccessible addressDavid Schulz2016-08-031-1/+5
| | | | | | | | Always report back when content for the memory view is requested. Task-number: QTCREATORBUG-16555 Change-Id: Idc6202a392899c5d524c696ac7342c4ea4487b1e Reviewed-by: hjk <hjk@qt.io>
* Squish: Stabilize test for removal of break pointsChristian Stenger2016-08-031-0/+1
| | | | | Change-Id: I1fdfc654e18a4cb219624b65e5d812faa479eb66 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Flat Light Theme: Fix inactive project tab in Projects modeAlessandro Portale2016-08-031-1/+1
| | | | | | | The text should not be white, since it is dran on a bright background. Change-Id: I1671c84946b9449539c10f7863fe85e04d4dd362 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Describe Autorun CMake check box in CMake optionsLeena Miettinen2016-08-032-0/+11
| | | | | | | | Update the screenshot. Change-Id: I3d0970b0f9dd9ff92f19e67c19de824f03859d76 Task-number: QTCREATORBUG-15934 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Load images lazily in mini target selectorOrgad Shaneh2016-08-031-5/+2
| | | | | Change-Id: Ifbaca8dc6d94327ab30c1ddbe99246131e06f3c0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* adjust to changed QMakeParser APIOswald Buddenhagen2016-08-031-5/+5
| | | | | | | amends b7706cdfeb. Change-Id: I83fc5d2b1c660d3c6f9c456b0f54c0fd2d669140 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Qt Creator Dark text color scheme: Fix #d64564Alessandro Portale2016-08-021-3/+3
| | | | | | | | | Replace all three occurrences of #d64564 with #ff6aad Otherwise it is hard to read preprocessor code, qml bindings or mismatched parentheses. Change-Id: I2812f3d10a1b1d4d2206cc4c19e97b81391e4ce4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Describe C++ Options Getter and Setter tabLeena Miettinen2016-08-024-0/+10
| | | | | | | Add and update screenshots. Change-Id: Ie5cd6502d66217db488a5f16dbc6d2bd70906954 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Restructure the beautifier topicLeena Miettinen2016-08-023-25/+22
| | | | | | | Add a screenshot of general options. Change-Id: I32ddc7a71449b1459930e74d65b034969870e5e7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Describe requesting Clang warningsLeena Miettinen2016-08-022-4/+42
| | | | | | | Add a screenshot. Change-Id: I5586d30e3a5e8701d44f96d65fc498410ceaa70d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Update screenshot of Clang Static Analyzer optionsLeena Miettinen2016-08-021-0/+0
| | | | | Change-Id: Icc8e7c70ed388f6b37f8801f201a82233c7e9bed Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Update QML Profiler screenshotLeena Miettinen2016-08-021-0/+0
| | | | | Change-Id: I14b3be4f7a312c6c072f05badd3f95e1d57c69ea Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Update screenshot of Build & Run General optionsLeena Miettinen2016-08-022-1/+1
| | | | | | | To show the new icon. Change-Id: I5e71db7d553b73f066422fe19b4f9b5327cdb71e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Add screenshot of Search Results > Find in File SystemLeena Miettinen2016-08-022-0/+2
| | | | | Change-Id: If43c6a8ea5c6d60d29b505b55144ef4651ec0ec8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Debugger: Fix startup of PdbEngineChristian Stenger2016-08-021-0/+4
| | | | | | | | | | | If the Modules view of the debugger is one of the enabled views the command for fetching modules is triggered before the PdbEngine could start up at all. Ignore the respective command if the engine is currently requested to start. Change-Id: I509d122ecba4f3bde6b2139a519c9a12ac627c2f Reviewed-by: hjk <hjk@qt.io>
* Debugger: Only clear the locals view when updating the QML localsUlf Hermann2016-08-021-1/+1
| | | | | | | | | | There is no reason to clear all the other views, too. The inspector view stays valid across interruptions and the C++ views have nothing to do with this at all. Change-Id: I7a0bfe160a6b3c0134d592abef9c10f95fcfcd3f Task-number: QTCREATORBUG-16692 Reviewed-by: hjk <hjk@qt.io>
* Debugger: Register step out action also for QMLUlf Hermann2016-08-021-2/+1
| | | | | | Change-Id: I11dceb325d5611bb5a0d9fb9750dbefdea60f2dc Task-number: QTCREATORBUG-16691 Reviewed-by: hjk <hjk@qt.io>
* Doc: Add missing textLeena Miettinen2016-08-021-3/+3
| | | | | Change-Id: I37192b7fdb6e093a39bc2522c73e84b62ec6f9a2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Improve error reporting when parsing JSON filesLars Knoll2016-08-022-3/+9
| | | | | | | | | | | At least report the error string and the file offset where the error happened. Change-Id: Iaa1733593b8af2a7a52b67c0f495731f045d2c11 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/34c24ceb1ffce964c9f139d84b6b271bd2e45c33) Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* add $$sorted() functionOswald Buddenhagen2016-08-022-1/+11
| | | | | | | | | | | | [ChangeLog][qmake] Added $$sorted() function. Change-Id: Ic069d3ef7c0b7a260c714c76eecc71c41417d01f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> (cherry picked from qtbase/50e22c765343102c4e0acf1eee8a6ce6f6f39ccf) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* add $$str_member() functionOswald Buddenhagen2016-08-022-37/+74
| | | | | | | | | | | | | | | just like $$member(), but operates on a string value rather than a list variable. it is the swiss army knife of cutting, providing equivalents of left(), right(), mid() and reverse() all in one. [ChangeLog][qmake] Added $$str_member() function. Change-Id: I7c7c6c971db402fff41b428d32a4451f45400728 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/e70330f99e53bd34a518879a0a4c68bc7cb03949) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* add $$str_size() functionOswald Buddenhagen2016-08-021-2/+9
| | | | | | | | | | | | | | | this is strlen(), but the name is matched to $$size(), just namespaced to reflect that it operates on a string value rather than a list variable. [ChangeLog][qmake] Added $$str_size() function. Change-Id: I56c8b863da244e66bd283257a66b197aa73b0e57 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/22f3800cac47b1b3d10474e8489ddb83cffd4b1e) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* add $$num_add() (numeric addition) functionOswald Buddenhagen2016-08-021-2/+26
| | | | | | | | | | | | | | | | amazing how we managed to do without it for so long. ^^ the name is intentionally somewhat obscure to avoid clashes, and some namespacing is good anyway. [ChangeLog][qmake] Added $$num_add() function. Change-Id: Ib7648b1f425ef096a87b51f158d0f1409e5c4daa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/d3cc25ef52d0b2b7ba1cb06609f7c205ee19c2d6) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* add $$take_first() and $$take_last() functionsOswald Buddenhagen2016-08-021-1/+18
| | | | | | | | | | | | | | while implementing stacks and queues was possible before with the help of $$member(), these functions make it much more straight-forward. [ChangeLog][qmake] Added $$take_first() and $$take_last() functions. Change-Id: I4922a5331780e468a42c663c9ad3c6456a95a6bf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/3d21634fb693634b7d41a152287d29afb80ac5e2) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make split_value_list() take a QStringRef as inputOswald Buddenhagen2016-08-023-10/+12
| | | | | | | | | this also saves some of the cheap but ugly toQString() calls. Change-Id: Iebe644986501db3878306521c76e4ba2c2fb97b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/981f8ad2e4bc46d9a06dab0cbc32a7da755ececb) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make QMakeParser take a QStringRef as inputOswald Buddenhagen2016-08-027-29/+33
| | | | | | | | | | | | the only place where this actually saves a deep copy is the evaluation of if(), but as a side effect the parser is now able to deal with not null-terminated strings, which is kinda nice as well. Change-Id: Ib6d08617aa79d2f9eaecd4906d4d548f34bf377d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/ad17a35853fe21a93fc34f7b2d9262c5ac992b29) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* add ProStringList::join(ProString) overload and make use of itOswald Buddenhagen2016-08-023-3/+8
| | | | | | | Change-Id: Ic3919a1fa9419bbb3b57dd1aa7eb95643ee59e53 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/e45a9fe457a4e5e70bf4e62092b253675dc97819) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* introduce a new way to pass arbitrary arguments to the project fileOswald Buddenhagen2016-08-022-1/+12
| | | | | | | | | | | | | | | | this is done by recognizing the -- option and putting everything that follows it into the QMAKE_EXTRA_ARGS variable. the purpose of this is being able to pass "alien" arguments (for example configure options) without having to marshal them into a qmake variable assignment manually. this is expected to greatly enhance the convenience when no wrapper script (i.e., configure itself) is used (which will be the case outside qtbase). Change-Id: I47735bdab2811d17d7d394fbf638ebd14332ea73 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/26d44fce3dfb9dbd3b5be2a031fff8c1bb903960) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* add ProString::toLongLong() and make use of itOswald Buddenhagen2016-08-022-1/+2
| | | | | | | | | this is just a bit cleaner. Change-Id: I03e628aca9e2e53c602a4db724da277a0e2c2486 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/e6b755e702fd6d8ebeb25ecd7a5059e62da6c971) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* remove pointless conversion to QString in isTrue()Oswald Buddenhagen2016-08-021-5/+4
| | | | | | | Change-Id: I7766672018dd4acf9b9fb89acfe664671de4bc3d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/7931395d5bf30d783449e1696edf8d59b81462ed) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* remove pointless conversions to QString when converting to intOswald Buddenhagen2016-08-021-6/+6
| | | | | | | | | this doesn't change a lot, but is cleaner. Change-Id: Ia89c399d6df7cc6264954cf309d2c971a5592d6b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/a7a3cd643a554c717ad8fb2bdad3e941dfd94cec) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* optimize ProString::toInt()/toShort()Oswald Buddenhagen2016-08-021-2/+2
| | | | | | | | | QStringRef has respective overloads now. Change-Id: I9b94c53092ef3fdd62a68f5d3c5bacb98a14d8ec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/e8bdca74b513b58d3db892d838b3a499365ca7e2) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: restore nothrow move special membersMarc Mutz2016-08-021-0/+14
| | | | | | | | | | | | | The user-defined copy assignment, copy constructor and dtor inhibit the move special member functions. Implement them manually. Change-Id: I0d38d7cf6c9611e13b5b081d734d01d6fe4d5276 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from qtbase/9c63ad562bf0a44807f41ce49e4fe1b5ff181a63) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: de-duplicate QString::number() calls with same argAnton Kudryavtsev2016-08-021-2/+3
| | | | | | | Change-Id: I6e05b9ad3350bd0da5b8a6dc1389ae05315a33df Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from qtbase/27de4ea4d672d9f1b3a733f803f8605f81311d0a) Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
* qmake: optimize container usage in the json handlingAnton Kudryavtsev2016-08-021-5/+11
| | | | | | | | | | | | | | | | | | Iterate only once over QJsonObject, create key list by existing loop instead of create by QJsonObject::keys(), which contains internal loop. In common case if loop's statement is lightweight, then effect of optimization is significant, and vice versa. Also make addJsonArray() and addJsonObject() functions more homogeneous. Use reserve to optimize memory allocation. Change-Id: Id122cd1becfd34bb06640876b1c79e1d396d2a6b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/69ab28031549ff1c9ceecdcb29197900e9bc4328) Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
* qmake: use reserve to optimize memory allocationAnton Kudryavtsev2016-08-022-1/+6
| | | | | | | | Change-Id: I6ace338512c24fd9dc11c767a28f0a63454076fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/1d3503b8f3b49b0f684e1caa504deb0d05f2c60a) Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
* qmake: eradicate Q_FOREACH loops [already const]Marc Mutz2016-08-024-18/+18
| | | | | | | | | | | (or trivially marked const) ... by replacing them with C++11 range-for loops. Change-Id: I1522e220a57ecb1c5ee0d4281233b3c3931a2ff8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/d9229d849f44cf94e4ee19fac390811b474127d2) Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: eradicate Q_FOREACH loops [rvalues]Marc Mutz2016-08-023-17/+34
| | | | | | | | | | | | | | | | ... by replacing them with C++11 range-for loops. This is the simplest of the patch series: Q_FOREACH took a copy, so we do, too. Except we don't, since we're just catching the return value that comes out of the function (RVO). We can't feed the rvalues into range-for, because they are non-const and would thus detach. Change-Id: I5834620bf82f3442da7b2838363d351a0fb960a0 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/8d7e913248aa1cad23447668d98911bba01faf4b) Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: don't iterate over .keys()Marc Mutz2016-08-021-2/+2
| | | | | | | | | | | | ... iterate over the container itself instead. Avoids temporary QList creation as well as the lookup cost when actually calling value(key). Change-Id: Icac867c30e63863cfa44a382eedd4d6df2070a59 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/c9cb20c01a0f3fa93ff9f79fd7ea3f53939497c4) Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: replace a Q_FOREACH loop with QList::op+=Marc Mutz2016-08-021-4/+1
| | | | | | | | Change-Id: Ibaa49f0d6ea5cbcb5d4d305ec9c55286eac5046e Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/dce2612a7c511e85c5a1b46d1e76b88b56be4c99) Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMake: Add option to set qt.conf fileDavid Schulz2016-08-023-1/+9
| | | | | | | Change-Id: Ie5db11892ccf2d357773a4db6a0464bf27be9a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/dbf1c2eb9f4e1feb24a58699b7b550016802e386) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* terminate when command called by system() got SIGINT or SIGQUITOswald Buddenhagen2016-08-021-3/+10
| | | | | | | | | sync up with qmake - this doesn't actually do anything in qtc. Change-Id: I5e5df9f6d136601f0f36a8d645f90a1cab9995ad Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/f8ef7e1d2619e6d394c57561bb275767f0517b24) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix raw data leak in $$absolute_path()Oswald Buddenhagen2016-08-021-1/+5
| | | | | | | | | | | when the file name is empty, the path will be returned verbatim. this must be considered when constructing the return value. Task-number: QTBUG-54550 Change-Id: Ie108ed52275e66a154ef63bd6f7193f55b3e0454 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/3c8134958c66f40bb86588aa91b83bf58b5de0c9) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix calculations of worst-case size requirements for token bufferOswald Buddenhagen2016-08-021-6/+9
| | | | | | | | | Task-nubmer: QTCREATORBUG-16508 Change-Id: I3aa4c736acec44f95a0a33c7baae9276568f684f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/d459a6b0e0d4f128caceaafe981ecf374bb3e420) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix custom functions inheriting other functions' argumentsOswald Buddenhagen2016-08-021-17/+39
| | | | | | | | | | Task-number: QTBUG-41830 Change-Id: Iba3eee4975a1ee671b7190e52c0efc9a18147c62 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/dacf3994ba29106132c3a377dba303acdb74daca) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make error() propagate from requires() and REQUIRES=Oswald Buddenhagen2016-08-023-6/+12
| | | | | | | | | | that can make sense if a function which determines the availability of a dependency fails to do so for unexpected reasons. Change-Id: If6cd113df25aee66830c120a2fab067c822a4543 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/1b4ea11332f74984a62a4cc4597ad49f5b5269dc) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make error() propagate from custom replace functionsOswald Buddenhagen2016-08-022-51/+73
| | | | | | | | | it didn't, which is rather unexpected. Change-Id: I8cdb7b1490a8c2207809812b93cc65fbe23a1b98 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/339b9706ccbed4063a92337c9994731793558b0a) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
View Lorry Controller Status