summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Port away from QRegion::rects()HEADdevMarc Mutz2017-12-011-7/+3
| | | | | | | Use being()/end() instead. Change-Id: Ie556bcb555be1f4024b70dff9653b1d00585fd17 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-279-29/+29
| | | | | Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f 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 remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-172-2/+2
|\ | | | | | | Change-Id: If9912b8068ded874986a4cc91c8ed8146900487f
| * Doc: Change instances of 'OS X' to 'macOS'5.6.2Topi Reinio2016-08-152-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2916-37/+46
|\| | | | | | | | | | | | | 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-121-5/+4
| | | | | | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-173-7/+8
| |\ | | | | | | | | | Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
| | * Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-043-7/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
| | | * Doc: Replace Mac OS X with OS XNico Vertriest2015-07-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-101-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05-1614-44/+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>
* | 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-23323-2302/+2286
|/ / | | | | | | | | | | | | | | | | 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-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>
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-25322-6118/+3542
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Fix Flickable mouse grab issue.Robert Griebl2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This issue cannot be reproduced on the desktop with a mouse (at least I could not). It can however reliably be reproduced on iMX6 embedded hardware with a touch-screen. It seems like the TS driver is reporting mouse events with a much more coarse granularity than the USB mouse driver, which in turn triggers this bug. (Qt4's declarative, as well as Qt5's quick1 and 2 all have the same issue) Change-Id: I01c9fc433a78d5f79518786783e24f3f93eaa50a Task-number: QTBUG-27185 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | Add handling of value-type lists to QDeclarativeExpression::evaluate()Robert Griebl2014-08-051-1/+13
| | | | | | | | | | | | | | | | | | | | | | QDeclarativeExpression::evaluate() converts all arrays to QList<QObject *>, even if the items cannot be represented by a QObject *. In case of a string-list, a QList of null-pointers is returned (which isn't very helpful). This patch makes evaluate() convert arrays, which contain ONLY value-type items, into a plain QVariantList. Change-Id: Ib8452cf9dd0241f146955f5de35336f48b9007c1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+4
|\| | | | | | | Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452
| * Compile fix: do not use composeMode() if QT_NO_IM is defined.Steffen Imhof2014-07-021-1/+4
| | | | | | | | | | | | Change-Id: Ib0046657ba687e6427c67c7dce0d71ec3be87f48 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | QDeclarativeError::toString: improve handling of empty urls.David Faure2014-07-262-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | "file::2:23: ..." is strange to read. Show "<Unknown File>:2:23: ..." instead, by treating empty urls (including "file:") as unknown, and by still showing line and column numbers in such a case. This change makes it possible for QUrl::fromLocalFile("") to return an empty url rather than "file:", which this module was relying upon in the tests. Change-Id: Id6d8aaa73673283cb65cbd1316dca77f859a3f8f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-06-033-15/+15
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/declarative/qml/qdeclarativemetatype.cpp Change-Id: I133752e1df91677925005fa8c1268b32fba312ea
| * Don't add the database before verificationv5.3.1stableRob Hoelz2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local storage facility exposed to QML has a bug; if you attempt to open a versioned connection, the version is wrong, and you try to handle that error, the connection is still stored in a connection pool, but in an unopened state. The next time you attempt to connect, no matter if you have the version right or not, the database handle will complain about being unopened. See also http://qt-project.org/forums/viewthread/38458/ Task-number: QTBUG-38543 Change-Id: I597497aab4895c868275a247ad96fb969e1c8ae5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix copy and paste errorFrederik Gladhorn2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | Fix error 13 identified by static analysis from http://www.viva64.com/en/b/0251/ This is in line with qtdeclarative. Change-Id: I3d3879bb93f9ae5bdcdd583645b1657f55140fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Don't use a variable called 'interface'Thiago Macieira2014-05-071-13/+13
| | | | | | | | | | | | | | | | | | MSVC has #define interface struct, resulting in a nonsensical error from the compiler about "struct: missing tag name" in a line that doesn't say "struct". Change-Id: I1ca703fd7920052e9d0bdf9a6936df77597ff022 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-111-0/+2
|\| | | | | | | Change-Id: Ie3850f2b3abc07fff45c563c9a80045fdd6468bb
| * make QtQuick1 claim plugins of type 'qml1tooling'Oswald Buddenhagen2014-04-071-0/+2
| | | | | | | | | | Change-Id: Ifd4d0da3e79fc087f56a3d3c8104e35a66ef47fc Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-011-1/+1
|\| | | | | | | Change-Id: I222f518e398b90382e452921411cfe81836ce02f
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 22:53:47 +0000