summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Ie0f7445005e100b53d2aacf90ef1133c7391251f
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I6270ccffa3bda3691b1163d0de3b96152a28704a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Fix remaining Clang warningsFriedemann Kleint2018-08-2712-89/+66
| | | | | | | | | | | | | | | | | | | | | | - Remove else after return/break - Avoid copies of variables which are used as const-ref - Simplify boolean return values - Remove redundant declarations - Use range-based for where applicable Change-Id: I5a3e4ba86845ac4d1c6f166c3f808eb06469c28f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix clang-tidy warnings about class definitionsFriedemann Kleint2018-08-2715-102/+114
| | | | | | | | | | | | | | | | | | | | | | - Use ' = default' for trivial constructors/destructors - replace virtual by override or add override where applicable - Replace trivial constructors by member initialization for simple structs - Add Q_DISABLE_COPY or spell out deleted functions where only a copy constructor is implemented Change-Id: I0b1610cb1425dd276a97df8179140c55f2e7b049 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Remove compatibility with older qtbaseKai Koehne2018-08-252-7/+6
| | | | | | | | | | | | | | | | | | Amends 4bbc782fc70f30e8b15. Task-number: QTBUG-69911 Change-Id: I821739583e347f95a0aa114008e01db1e42eef92 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adapt to QMetaObjectPrivate changes in qtbaseKai Koehne2018-08-142-6/+9
| | | | | | | | | | | | | | | | | | | | Commit 1c623bc6d1c0a7c in qtbase bumped QMetaObjectPrivate::OutputRevision, which caused qtactiveqt builds to fail. Task-number: QTBUG-69911 Change-Id: I40be892d8c80fdc4706ae176bbafb302fdd00921 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-144-7/+7
|\ \ | |/ | | | | Change-Id: I59bbda884eb38d563b29a50f9a205922ce80066c
| * Replace CoInitialize calls with CoInitializeExFredrik Orderud2018-08-134-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Done to make single-threaded apartment (STA) usage more explicit. CoInitializeEx(0, COINIT_APARTMENTTHREADED) does exactly the same as CoInitialize(0), so there is no change in behavior. REF: https://docs.microsoft.com/nb-no/windows/desktop/api/combaseapi/nf-combaseapi-coinitializeex Change-Id: I2e2f77745b4360b1da1e6c284551d0f709aba546 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id783b0906502f66e6be89c2008205a9f198ae282
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I3c854f7b5d567c14774267f7b64ef1e803d83666
* | Migrate tools/testcon's ChangeProperties to QRegularExpressionSamuel Gaist2018-07-061-2/+2
| | | | | | | | | | | | | | | | | | This patch updates the ChangeProperties class of the testcon tool to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: If972c091fa929f77282b94e46f37c2d945df9262 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Migrate QAxServerBase to QRegularExpressionSamuel Gaist2018-07-031-5/+7
| | | | | | | | | | | | | | | | This patch updates the QAxServerBase class to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: I5f2a182bff583ff015fde71bfc164a5a27c5b1d3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Migrate QAxWidget to QRegularExpresssionSamuel Gaist2018-07-021-2/+2
| | | | | | | | | | | | | | | | This patch updates the QAxWidget class to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: If11f23f2492012cb69726e54f80801fd9481a066 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\ \ | |/ | | | | Change-Id: Ie1a74cf99dededce7d8e8d7b3a9e3742ee3f35c4
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: Id2dc9fbf50962bd2ffc3a14faa082b7dbbe8b53e
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-121-0/+24
| |/ | | | | | | | | Change-Id: Ic39713563757939e89309dcfdf5ce27f1634c90d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-1/+3
|\ \ | |/ | | | | Change-Id: I36f67a600e5d2d94907eb68aa8e624b72ea76030
| * Fix memory leak in QAxBase::internalInvoke()Friedemann Kleint2018-06-061-1/+3
| | | | | | | | | | | | | | | | | | | | Free the return value. Patch as contributed via bug report. Task-number: QTBUG-68415 Change-Id: I9696867796db51e4b3df3830c2deb72d2b791987 Reviewed-by: Daniel Friedrich <friedrich@nanosurf.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-043-0/+49
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1ef4c216c90e89e48e56936d81b5229e86f63508
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | Change-Id: If61653edd3e379fe9d623798967d4c6db9cd0449 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit ab4271873f93fa757c1fa1c1ae2eea58c5dcbab4)
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | Change-Id: Ie79c080cc755dea195a32ca558470f97a3603bde Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 814937597880ef57e4c6310a4c5042d9f61d9315)
| * Disable -Woverloaded-virtual also for clang-clDaniel Teske2018-05-311-0/+1
| | | | | | | | | | | | Task-number: QTBUG-63512 Change-Id: I4447f8f8746717a5f3ce161da8d7dbf10d162636 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I7f408dc1c3005beda3740df6187805c4937adfc0
* | Fix Qt include statementsFriedemann Kleint2018-05-227-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Change #include <QtCore/QDebug> to #include <QtCore/qdebug.h> according to the coding style. Change-Id: Ie8cf4d28fc0ec7f95fe86806e5402173a0c63cb7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: Ifde8a0d9a2d4530ba56a70de3b68e09924cb28ae
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: Ief697bc60bc0d8d2f06741c6428aacd236b14bb2
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-201-0/+22
| | | | | | | | | | | | | | | Change-Id: I53a7795c6132b603d5727cf60e2ccf349a72828a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-011-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I3b59ac5c5f6f19b7a4b95188af4c6f0a52d38f38
| * | Doc: Fix formatting of BSD license textKai Koehne2018-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use \badcode...\endcode instead of \legalese. This fixes the indentation in the generated page. This patch amends c095e6ad6f5. Change-Id: Idba9af07cab996f40f68c33fbe3579e522fa19c7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-211-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: Id8373b872900aacfbd363dd982a5f53452091cb3
| * | dumpcpp: fix generated string literalOswald Buddenhagen2018-04-201-1/+1
| |/ | | | | | | | | | | | | reported by 'olehs' on github. Change-Id: If07cf9b9b753d46513a80aa2d854d0b55b27dcff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-143-80/+37
|\ \ | |/ | | | | Change-Id: I144bd99e6a567bb7ad5196827453c0e9c135b24d
| * Update the doc about the license to reflect that it is dual licensedv5.11.0-beta4Andy Shaw2018-04-093-80/+37
| | | | | | | | | | Change-Id: I8728e32726fb45f04acfe878aca54a67f62961a9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-076-24/+88
|\ \ | |/ | | | | Change-Id: Ic384223d4798497f3ab3fa09f57b8ab41dbda2da
| * Doc: Resolve documentation warningsTopi Reinio2018-04-056-24/+88
| | | | | | | | | | | | | | | | | | | | Provide a custom module headers and additional include paths to make Clang parse the C++ documentation correctly. This is needed as e.g. on Linux, the build system doesn't provide these because the module is not going to be built on that platform. Change-Id: Id81c4dbdd546b2dea08d30ebea2717157b6df81c Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-272-1/+27
|\ \ | |/ | | | | Change-Id: I14dd865d8025cba6b7de3064359e318b406a4248
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c842982b27f137e28f5207cbaf054a9d9f1d83a
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: Iefeacca7186f6df2b1ce6ec273a8d66831627d09
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: Ib1b90b8fdfc291fd10e9ed0244d7b113c2a2954b
| | * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I1fb01910908a0b3392397a41bce65aea60e27316 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | Fix typosJarek Kobus2018-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ide9a069a37a6d289a3f0223f17563a440d67c461 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I4e31108268f92255c60176bdbc38b00d183ba1de
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-203-3/+54
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8f6b5ce962177001d064be5b7b0c4740607e999b
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-182-3/+30
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibeb74b560f39f3b6b48344873c87aba3a4af8a2c
| | * Fix compilation with newer gccKai Koehne2018-01-111-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move disabling of overloaded-virtual warning before the includes, and the Q_OBJECT definition, to make it effective. Task-number: QTBUG-65676 Change-Id: Ic34e5ade0b21b53540db9b2f429f1b441463632c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-051-0/+24
| | | | | | | | | | | | | | | Change-Id: Iead5f79b489e14cf654fcafbcc171557c9f6e8e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I258176199edd6a6cd413830bfeb0eac070bd5a89
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I276cd0a8a52f95750208caca0fcd18f5b1489f5b
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I511c823669dfb97447a05e50defc6b37a22a651d
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I6c5fa57cf0b912a2528bd9113ff4dc01d9e0bfba
View Lorry Controller Status