summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Port away from QRegion::rects()HEADdevMarc Mutz2017-12-012-8/+4
| | | | | | | Use being()/end() instead. Change-Id: Ie556bcb555be1f4024b70dff9653b1d00585fd17 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Revert "Use QRandomGenerator instead of q?rand"Thiago Macieira2017-10-262-15/+16
| | | | | | | | This reverts commit 8a7b80ebea1fa30d892028e34696890d3321e816. Let's just leave qtquick1 with the old qrand API. Change-Id: Icaa86fc7b54d4b368c0efffd14f0b39b77f17d30 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-279-29/+29
| | | | | Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Express dependency on QtScriptJake Petroules2017-09-081-2/+1
| | | | | | | | | This properly skips the module build if QtScript is not available. We also remove the !winrt check since this is implied by and as a result of !qtHaveModule(script). Change-Id: Ia94e90ff65131a36f64e4839c4aeef9fd0d1c845 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Use QRandomGenerator instead of q?randThiago Macieira2017-06-302-16/+15
| | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QDeclarativeTextEdit fix sign compare warningNikita Baryshnikov2017-04-261-1/+1
| | | | | | | in oldAlignment == opt.alignment() Change-Id: Ie7672507d2ba0380fecada58c0cab6983c6e5afb Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
* Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2017-04-059-45/+29
|\
| * Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-11-269-45/+29
| |\ | | | | | | | | | Change-Id: I4de2529ce5a4ce8227c7f320cbee9610e5ac7594
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-16/+0
| | |\ | | | | | | | | | | | | Change-Id: Ic422029c32ed96c71c4b65f9afb184c2c4bc696d
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I3c1f1d55e2668f0c3a33b5456a942516916fb3c1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-177-8/+8
| | |\ \ | | | |/ | | | | | | | | Change-Id: If9912b8068ded874986a4cc91c8ed8146900487f
| | | * Doc: Change instances of 'OS X' to 'macOS'5.6.2Topi Reinio2016-08-157-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iec248314791d9dbb1ab11959121376265cefd7fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-21/+21
| | |\ \ | | | |/ | | | | | | | | Change-Id: I4863cb26899aa8c20b0cbad196016e9905fd0a81
| | | * Work around ICC bug about C++11 noexcept inheritanceThiago Macieira2016-07-231-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qquickitemanimation.cpp(213): error #809: exception specification for virtual function "QQuickParentAnimationData::~QQuickParentAnimationData" is incompatible with that of overridden function "QAbstractAnimationAction::~QAbstractAnimationAction" Change-Id: I149e0540c00745fe8119fffd1463cb59e590b6b8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | QRegExp include cleanupSamuel Gaist2017-03-263-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | This patch adds missing include statement where the QRegExp class is used. Change-Id: I059825d8d3a9b97775d88f429d7e45564c0b44f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Cast to int before streaming an enum to QDataStreamThiago Macieira2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | It's decoded as int. Change-Id: Ic46ff326a6ba46bc877cfffd148324b27b848f40 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devOswald Buddenhagen2016-07-0135-61/+762
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I39ab590ec2c95b3c213e90dad5a8f5e3e626baab
| * | Bump versionOswald Buddenhagen2016-07-011-1/+1
| | | | | | | | | | | | Change-Id: I63c26a17001259dda17256291fc181ddccb5ca50
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2935-60/+761
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-294-4/+4
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I5fe2b6e4d1ed245f9f29f2c2a39d7b9394e3bb70 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Fix gcc warning: if clause does not guardNikita Baryshnikov2016-06-291-1/+2
| | | | | | | | | | | | | | | | | | Change-Id: I30693fa9b1553e22d0793021dc46054f979976ca Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I7c2473f07d7d1b65f39cf51df2817d4a74296462
| | * do not enable example installs explicitly any more5.6.1Oswald Buddenhagen2016-04-281-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I5354ed1d92ffb988a0771783f94ee728b9ebeb12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * pretend that the example installs are not FUBAROswald Buddenhagen2016-04-281-0/+2
| | | | | | | | | | | | | | | Change-Id: I1fad2e055f3d10d481a4bb01c014e9ac8c1abf44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-04-123-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ic2ea6f6cae734b8094ba0617f67435f5a4fb2b14 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * qtquick1 doc: Fixed format error in PNG image's gAMA chunk.Edward Welbourne2016-04-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran pngcrush -ow -brute -rem allb -reduce src/doc/src/declarative/pics/BorderImage.png to eliminate warning identify: Ignoring gAMA chunk with gamma=0 `src/doc/src/declarative/pics/BorderImage.png' @ warning/png.c/MagickPNGWarningHandler/1671. from ImageMagick's identify command. Change-Id: Iecf185c9400add0b4ea64b3c7397f79d12e7268b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-1716-18/+710
| | |\ | | | | | | | | | | | | Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
| | | * Merge remote-tracking branch 'origin/5.5' into 5.6.05.6.0Liang Qi2016-02-0412-14/+706
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
| | | | * Skip failing autotest tst_qdeclarativetextedit::delegateLoadingv5.5.15.5.15.5Kai Koehne2015-09-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test failures point to a race condition in QtNetwork when a socket is prematurely closed by the server. Anyhow, the race condition has been there before, just that a recent change in Qt5Core made it more likely to be hit. Disabling the test for now: This is better handled in qtbase, and shouldn't block the release. Task-number: QTBUG-48299 Change-Id: If6877d47940d422e94b6d20d24a8fbdb89692f71 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | | | * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-190-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I70e0e7aa8d1a6146ff5b18b3a38131714a45d67b
| | | | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c1be89eed9b487c78e000704973f2cc66d683ae
| | | | * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | | | * | Doc: Replace Mac OS X with OS XNico Vertriest2015-07-167-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| | | | * | QtDeclarative: fix const correctness in old-style castsThiago Macieira2015-07-102-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c95df89028fe1c Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | | | * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3d7f68d9a8bf85fbedcb0913ed9144fcc4808dd
| | | * | | Fix autotests for change in QtNetworkLiang Qi2016-02-044-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change 4efa50a5e37497bc3a3dd30f27db7d8100e3f6a5 in qtbase Change-Id: Ie14f19228e0a19bd0b1d9443356276b8114ac62b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * | | | Export QDeclarativeTextEditPrivate, QDeclarativeLayoutItemMarc Mutz2016-03-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are used in tests and while these tests don't call functions on them, a ubsan build will need and fail to access the type_info for these classes. Change-Id: I4badf9f70f4153acd3caea865ff137e443cb0a8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * | | | Make more ctors explicitMarc Mutz2016-03-078-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. One is even a protected ctor. Change-Id: If047884d130206b8ea42148476ab449c2cbf7529 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * | | | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-079-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I1ef66cc4a88f71ae804c2f19e59456bc6b55f6c6 Task-number: QTBUG-45291 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * | | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I7831244b4ebc31d9adb135ce6453c09a185b076c
| * | | | QDeclarativeTextInput: update API to use setBlinkingCursorEnabled5.7.0Richard Moe Gustavsen2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWidgetLineControl::setCursorBlinkPeriod was renamed to QWidgetLineControl::setBlinkingCursorEnabled in qtbase:1b5bc97. This patch will update QDeclarativeTextInput to use the new API. Change-Id: If88c0d44f2ab29c9bc00f5a0226a28d45976ed43 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Iaa2c5ca98c930d434e152f665bb6bcf2eaac2a34
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib2b8d668934542c73dc54b51e29f51e94b33c80c
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-09-044-0/+10
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9448cc3d5a89596e7b0afe30ad9e9ef5cb8130c8
| * | | Exclude unstable testSimon Hausmann2015-08-252-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I5845c3aecc3856e5b375ea4c7742acc24ae97cc5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | | Fix build on OS XSimon Hausmann2015-08-252-0/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | After some changes in qtbase unistd.h isn't implicitly included anymore and we need to include it here for _PC_CASE_SENSITIVE. This is similar to commit 6503b4924f76673487e35994e2504c2a9d15bd97 in qtdeclarative. Change-Id: I80efd31909ebbc7c084d8a90313910cfbbbbebee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix users of QTextLayout::additionalFormats to use the new APIMarc Mutz2015-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QTextLayout::additionalFormats setters and getters using QList<FormatRange> have been deprecated; port to the QVector versions. Change-Id: If2a7d14c0c2e15099957135d565794b880d2ba80 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-039-208/+4
|\ \ \ | |/ / | | | | | | Change-Id: I436c6ecbac500eb2b7836c7b29756972ee9e14df
| * | Reanimate tests/auto/declarative/qdeclarativewebviewv5.5.0-rc1v5.5.05.5.0Friedemann Kleint2015-05-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CONFIG += testcase to qdeclarativewebview.pro. Use QTRY_VERIFY in multipleWindows(). Before this change, the test was not executed at all because "make check" was an empty target due to missing CONFIG += testcase. Add QEXPECT_FAIL to tst_QDeclarativeWebView::multipleWindows(). Change-Id: I7395876466f6d3b4c326336e47fb40bb6a60838e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Turn the QDeclarativeView Qt Designer plugin into a uiplugin.Friedemann Kleint2015-05-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin does not link to any Qt Designer classes, so, uiplugin is sufficient. Task-number: QTBUG-44724 Change-Id: Ibecdccd7080c0752d5605c33f2bbe4e9eb0a0e44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
View Lorry Controller Status