summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * deduplicate test command launching a bitOswald Buddenhagen2016-10-252-13/+15
| | | | | | | | | | | | | | | | | | | | | pre-calculate the lrelease/lconvert path once. Change-Id: Ia1603db955ef08e61d123393f6e69c4653d8b6a9 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Doc: Update documentation on \legalese QDoc commandTopi Reinio2016-10-251-35/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The \legalese command is not used in Qt 5 documentation, because it does not support collating license texts across modules. Update the documentation accordingly, and remove the obsolete example on how it's being used in Qt docs. Change-Id: Id3505ccf5b44bd2c2e236b8464dea18d4c7b8a89 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * designer-manual.qdoc: Fix typo in documentationFrederik Schwarzer2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I46c41a94ab1429e527ef01e342ee3f6578fa1876 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Qt Designer: Introduce utility function for the Qt logo iconFriedemann Kleint2016-10-125-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function qtLogoIcon() returning a multi-size icon to iconloader_p.h. Adapt the plugin dialog and widget box so that the logo icon is returned for empty icon names. Task-number: QTBUG-55137 Change-Id: If6843e75577b05c3bfcedf976849eba88b914547 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Qt Designer: Update logo icon used for iconless custom pluginsFriedemann Kleint2016-10-126-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the single size Qt logo by a series of icons, providing higher resolutions for High DPI. Task-number: QTBUG-55137 Change-Id: Ib128f679a8d9c6ce39ec0ae76c0d569d142aa636 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| | * windeployqt: Fix temporary file leakFriedemann Kleint2016-10-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Set FILE_FLAG_DELETE_ON_CLOSE on the files used for redirectoring process outputs. Task-number: QTBUG-56268 Change-Id: Ia0b25ed9067e0a40a9b83dc7d10a9cf15ac63b70 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Fix symmetry of streaming enums in QDataStreamThiago Macieira2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're often streamed in as int, so cast to int before streaming out. int marker, v; stream >> marker; Change-Id: Ic46ff326a6ba46bc877cfffd1483216a140d8276 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Qt Designer: Mark forms as dirty when changing the promoted classesFriedemann Kleint2016-10-311-2/+14
| | | | | | | | | | | | | | | | | | | | | Call QDesignerFormWindow::setDirty() when promoted classes are changed. Change-Id: I2310c73b8894658bf9fb8f2a76f0aa25364fae10 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Qt Designer: Remove class QDesignerUndoStackFriedemann Kleint2016-10-315-193/+11
| | | | | | | | | | | | | | | | | | | | | | | | The class emulated setDirty() functionality which was now introduced to QUndoStack as resetClean(). Change-Id: I11be2f6d746713ae872c8dc8705acc32c88f9ec8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | qdoc: Resolve attribution pages in single-exec modeTopi Reinio2016-10-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDocDatabase::processForest() must call findAllAttributions() before marking the current tree as analyzed - otherwise we fail to find any attribution pages with \generatelist command when running in single-exec mode. Change-Id: If1a9d665104089e3efa86ea9cb03b28dd817f295 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | | attributionscanner: Allow to specify multiple filesv5.8.0-beta1Kai Koehne2016-10-277-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far 'Path' was used to specify a whole directory, or a single file. This introduces a separate 'Files' property, so that one can document that e.g. two specific files in a directory contain third party code. 'Files' should be relative to 'Path'. Change-Id: If4213d9a1b1ca706c49ed761027c6af86fbdc02a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Fix a leak and a crash in designerJarek Kobus2016-10-263-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have never cleared the property sheets extension objects for object on the form. This was done on designer / creator exit, but in meantime we always cumulated all of them in memory, event when the original widget or its form got deleted. They were cleared since they were the children of QDesignerAbstractPropertySheetFactory which got deleted on app exit. Since property sheets were not removed, they were existing without their original object. We have remembered pointers to them in order to reload resources when needed. That caused a crash since we have referred to non-existing originals during resource reload. We have leaked so many billions of sh(ee)ts during last 10 years at least... Task-number: QTCREATORBUG-17150 Change-Id: Icf655cccf93a680b874cec8b1be333ce718db062 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Remove unneeded map and simplify extension codeJarek Kobus2016-10-211-23/+6
| | | | | | | | | | | | | | | Change-Id: If472a57975bcd9f5d5594ed6e633cb2b95f3289c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | qtattributionsscanner: Fix MSVC compiler warningFriedemann Kleint2016-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | | packagefilter.cpp(38): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data Change-Id: Ief4aad17ef27202cc00fe9de987ca30f4acbc2a7 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | use modularized platformsupport modulesOswald Buddenhagen2016-10-212-2/+2
| | | | | | | | | | | | | | | Change-Id: I613fe0bfbb355a617e88140ddeb29c889500e635 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Put attribution files into module namespaceKai Koehne2016-10-201-2/+2
| | | | | | | | | | | | | | | Change-Id: I9e3b6d1a212ce85191e99e143a0a571ac5915d4c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Linguist: Delay translations of the file format descriptionsFriedemann Kleint2016-10-148-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various init() functions are called before translations are loaded; thus the descriptions appeared untranslated. Use QT_TRANSLATE_NOOP to delay the translation. Task-number: QTBUG-56374 Change-Id: I9eb130f10a10e39011759c16a99ee4cf3a5dac99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | qtattributionscanner: Ignore licenseId's with spacesKai Koehne2016-10-111-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | SPDX license expressions can contain more elaborate structs with AND and OR operators. Just ignore these for now in the .qdoc generation step. Change-Id: I9bcd432ebd6a188a1745432ddd3aa5b3bbd48b03 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | add discard_from() functionOswald Buddenhagen2016-10-103-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this function discards all values that come from a specific file. it will be needed for configure bootstrapping, but is too obscure to document it for general use. Change-Id: I62c18aeb1847712e33d0599dbb0b90ffa1722438 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/12bb328bb0be8efe54aae750c21938aab4d17539) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | make include(,<into>) implementation a bit less convolutedOswald Buddenhagen2016-10-102-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this goes at the cost of <into> without the subsequent dot not being filtered before the result insertion any more. that's not expected to be a problem, as it's not particularly useful to iterate the target namespace without the dot in the first place. Change-Id: Ib3497a60613b4c8c26676fe76b731239e427b8a7 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/3277143f9609a0c257dd118c7fa4900b2fb36de3) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | optimize operator+ ProString vs. char*Oswald Buddenhagen2016-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have all necessary overloads now. Change-Id: Ic4472eba15d4234e968fcb9443d0f79011aa43fd Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/f137957e0887a9321b69b9ba83ed6ccaedee57bb) (cherry picked from qtbase/1df4b2a3609d977cc8123f1f82e454d0333287d4)
* | | Support C++17 fallthrough attributeAllan Sandfeld Jensen2016-10-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces our mix of comments for annotating intended absence of break in switches with the C++17 attribute [[fallthrough]], or its earlier a clang extension counterpart. Change-Id: I4b2d0b9b5e4425819c7f1bf01608093c536b6d14 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/9f888d2fde9c5413e5519e0914e9b13638760985) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | add support for returning the command's exit status to $$system()Oswald Buddenhagen2016-10-102-6/+17
| | | | | | | | | | | | | | | | | | | | | Change-Id: I242dfde344f555800cef1f55d3cb85418a93277f Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/0eff800e81f3e7f803dffd77737faaed73002ac8) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | print no message at all when no argument is supplied to error()Oswald Buddenhagen2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is useful when an adequate message has already been emitted by other means, like various built-ins do. Change-Id: I092771f55969fad8b214204d666327664727c572 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/22d1351ddea193f5c00d4ae12229358dea826c62) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Improve error reporting when parsing JSON filesLars Knoll2016-10-102-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>
* | | add $$sorted() functionOswald Buddenhagen2016-10-102-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-10-102-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-10-101-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-10-101-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-10-101-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>
* | | remove remaining pointless conversions to QStringOswald Buddenhagen2016-10-101-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have perfectly good overloads which work with ProString itself, or at least with QStringRef. Change-Id: I45f39b8c2f83216f20849dd58eb3b8d78726083d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/8bd0c3d4fc335ae39a02821a066a39f0fd6b0311) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | make split_value_list() take a QStringRef as inputOswald Buddenhagen2016-10-103-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-10-105-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | make QMakeEvaluator::isActiveConfig() take a QStringRef argumentOswald Buddenhagen2016-10-105-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | saves some more cheap but pointless conversions to QString. this makes the introduction of the ProStringList::contains(QStringRef) overload necessary. Change-Id: Ic61993bd9a4b28fbba1b8e346345fd5f5636c6f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/11d957d04381c7162dd5621c61f9963580ec7041) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | add ProStringList::join(ProString) overload and make use of itOswald Buddenhagen2016-10-103-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this introduces an ambiguity, so some char* arguments need explicit QString construction now. 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-10-102-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-10-102-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-10-101-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-10-101-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-10-101-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-10-101-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-10-101-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 handling.Anton Kudryavtsev2016-10-101-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: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | qmake: use reserve to optimize memory allocationAnton Kudryavtsev2016-10-102-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-10-104-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 [needing qAsConst()]Marc Mutz2016-10-103-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by replacing them with C++11 range-for loops. To avoid detaches of these mutable Qt containers, wrap the container in qAsConst(). Change-Id: If086bea06fe26232a7bb99fad8b09fce4dc74c27 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> (cherry picked from qtbase/e31541fa6f5f4df64fd44a9a895491c40b8c64b4) Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | qmake: eradicate Q_FOREACH loops [rvalues]Marc Mutz2016-10-103-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-10-101-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-10-101-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-10-103-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 20:14:23 +0000