summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Use QRandomGenerator instead of q?rand"Thiago Macieira2017-10-261-12/+12
| | | | | | | | 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>
* Use QRandomGenerator instead of q?randThiago Macieira2017-06-301-12/+12
| | | | | 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-058-29/+29
|\
| * Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-11-268-29/+29
| |\ | | | | | | | | | Change-Id: I4de2529ce5a4ce8227c7f320cbee9610e5ac7594
| | * 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-262-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | 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.6' into 5.7Liang Qi2016-06-2924-51/+60
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
| * 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>
| * 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-178-13/+14
| |\ | | | | | | | | | Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
| | * Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-048-13/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
| | | * Doc: Replace Mac OS X with OS XNico Vertriest2015-07-166-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | 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>
* / / QDeclarativeTextInput: update API to use setBlinkingCursorEnabledRichard 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>
* | 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-032-2/+2
|\| | | | | | | Change-Id: I436c6ecbac500eb2b7836c7b29756972ee9e14df
| * 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>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-1615-45/+47
|\| | | | | | | Change-Id: I10d9b8383a41aa427793c6ccfdbf0393064d9c49
| * Fix Blackberry and QNX 6.6 buildSergio Martins2015-03-293-3/+3
| | | | | | | | | | Change-Id: I647f478f9b888ed2bcdbda263446b82165c957e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * QtDeclarative: fix const correctnessThiago Macieira2015-03-1711-41/+44
| | | | | | | | | | | | | | | | | | Add const_cast where we're really violating the correctness. Found by GCC's -Wcast-qual. Change-Id: Iee8cbc07c4434ce9b560ffff13c9619c48672f5a Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-1/+0
| |\ | | | | | | | | | Change-Id: I9c521184dcdc023bdaecf6643bb6c60cc1a80a9f
| | * Doc: Removing url variable from qdocconf file.v5.4.2Sergio Ahumada2015-03-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I448ea5484c6956c6231e7a6ff93e29157e527755 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Use QByteArray::toDouble() instead of qstrtod.Erik Verbruggen2015-03-041-5/+1
|/ / | | | | | | | | | | | | No need to use a secretly exported symbol. Change-Id: I1cba959a789164cd9f584e9ff2591b7f85ab9a52 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-242-1/+3
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-202-1/+3
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
| | * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-0/+2
| | |\ | | | | | | | | | | | | Change-Id: I854c8bff922c0ffcaf2ea6daec00c12e9bed540e
| | | * Fix empty arrays in QML 1Robert Griebl2015-01-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9cbb6fa added a regression, where empty arrays would produce errors in QML 1. Change-Id: Ie5c784d5ec921d1ca69084750ed37fc2e273bbef Task-number: QTBUG-43656 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * | QDeclarativeTextEdit: fix use of uninitialised value.David Faure2015-02-041-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Detected by valgrind (in Qt 4.8.6): ==27068== Conditional jump or move depends on uninitialised value(s) ==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742) Change-Id: I17856a6d5e06f10f2daf5f3534c175526f21b5dc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | / Update copyright headersAntti Kokko2015-02-23662-3998/+3974
|/ / | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-191-2/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-021-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7a07ebd7ccf3fc9ec26f7bbf2936b1a787c097f7
| | * Fix change-of-sign warning detected by ICCThiago Macieira2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subscribeIndex is quint16, so it can't store a value of -1. Store 65535 instead. Note: in findgeneric, subIdx will NOT be -1. It will be 65535. Change-Id: I4b5ad6415609f409660a035de6f763ddb2da2f7e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Add missing includes.Friedemann Kleint2015-01-071-0/+1
|/ / | | | | | | | | | | | | | | After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3, QStringList no longer includes QDataStream. Change-Id: I25c86ab233a79e71a4e0723c729a571014012cb8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | [TextLayout] Drop unused memberKonstantin Ritt2014-12-141-16/+0
| | | | | | | | | | | | | | | | QStaticTextItem never uses `chars` and `numChars`. A respective change to QStaticText will follow. Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Do not use QMetaType::registerType.Jędrzej Nowacki2014-11-191-19/+13
|/ | | | | | | | | | | | | The function is transitional from Qt4 to Qt5. It should not be called. The patch is a semi cherry-pick of: 14e247e4b94df17ed62750b4468c2ac25aabe30f a49154a75005403185e3813d441fb3e1931af2a2 1f74dde59f8ecb8be3a41973ab5d8d435815edd6 from qtdeclarative. Change-Id: I5f90a58d6fa8d1df69e149da22e17e234173dd68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-144-0/+8
|\ | | | | | | Change-Id: I320a0ae55f27db5a8bcb50c2574c3f92fbf35e63
| * compile with QT_NO_CURSOR5.3Joerg Bornemann2014-09-173-0/+6
| | | | | | | | | | Change-Id: Ied2bb3467f6d76cfab57bbd27c7f4b315c036d6f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * compile with QT_NO_TOOLTIPJoerg Bornemann2014-09-171-0/+2
| | | | | | | | | | Change-Id: I3d50df90315de4c73b5d49520585676197011072 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-164-8/+33
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I842b005b9818c9e201a09d51bcf418e2dd0a1ef9
| * Make sure that the itemview's count property is reliableNils Jeisecke2014-09-104-8/+33
| | | | | | | | | | | | | | | | | | | | This fixes a missing countChanged signal when model changes happen while the itemview component is not completely initialized. Task-number: QTBUG-37115 Change-Id: I20c749b9e521b0292186adbecd09e1d362520881 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 00:21:03 +0000