summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-276-24/+24
| | | | | Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Doc: Change instances of 'OS X' to 'macOS'5.6.2Topi Reinio2016-08-151-1/+1
| | | | | | | | | | 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.0' into 5.6Frederik Gladhorn2016-03-172-6/+7
|\ | | | | | | Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
| * Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-042-6/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
| | * Doc: Replace Mac OS X with OS XNico Vertriest2015-07-161-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | | Make more ctors explicitMarc Mutz2016-03-075-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-076-17/+25
|/ / | | | | | | | | | | | | | | | | | | | | ... 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>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-169-38/+41
|\| | | | | | | Change-Id: I10d9b8383a41aa427793c6ccfdbf0393064d9c49
| * QtDeclarative: fix const correctnessThiago Macieira2015-03-179-38/+41
| | | | | | | | | | | | | | | | | | 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-241-0/+2
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-201-0/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
| | * 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>
* | | Update copyright headersAntti Kokko2015-02-23143-1042/+1026
|/ / | | | | | | | | | | | | | | | | 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 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>
* | 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>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-25142-2698/+1562
| | | | | | | | | - 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>
* 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>
* 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-032-14/+14
|\ | | | | | | | | | | | | | | 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>
| * 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 devSergio Ahumada2014-03-113-3/+3
|\| | | | | | | Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
| * Fix typos in comments and documentationSergio Ahumada2014-03-051-1/+1
| | | | | | | | | | Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Fix encoding of localized messagesKai Koehne2014-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | QDebug::operator<<(const char*) uses QString::fromUtf8(), while qPrintable(str) returns QString::toLocal8Bit(). This messes up e.g. the Russian translations. Task-number: QTBUG-35825 Change-Id: Ib3f0004df677196a0bd17ac48c65f2d51b833044 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | whitespace fixesOswald Buddenhagen2014-02-2080-919/+919
|/ | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Allow QtDeclarative and QtQml to co-exist at run-timev5.2.0Simon Hausmann2013-11-263-13/+9
| | | | | | | | | | | | | This patch changes QDeclarativeData to share the very first bit with QtQml's QQmlData, to indicate ownership by either run-time. We need to check the bit in the only QObject callback we use (destroyed), the other callback was unused and removed. Task-number: QTBUG-35006 Change-Id: Ife4b515648cba42b91612736ccd9375f1f46808a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove QtAlgorithms usage from QtQuick1.Friedemann Kleint2013-09-262-2/+6
| | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I774f69bd3e60764a144b921a2383d832b38765ce Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QmlJs: Fix yet another instance of QmlJsParser...Tobias Hunger2013-09-032-2/+2
| | | | | | | | | Same (!a == b) issue as everywhere else. Can we please unify all those parsers? They all are slightly different though, at least this issue, is never on the same line number. Change-Id: Ie2d1540d47b848ed0c7596b3f309c046b64390cf Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-232-1/+6
|\ | | | | | | Change-Id: I776abad2c248f697ff729057cfaff16b4a395380
| * Use GET method for redirect in QDeclarativeXMLHttpRequest.Friedemann Kleint2013-07-221-0/+5
| | | | | | | | | | | | | | | | Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl> Task-number: QTBUG-32332 Change-Id: I393308134d60e484464e0cfc6cdcdac1edc27f8d Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| * Fix regression from Qt 4 for deep group propertiesSimon Hausmann2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a property like someObject.font.family would cause an out-of-bounds assertion in QList, called from QQmlCompiler::genValueTypeProperty. This appears to be a regression from commit 5e970b84663f5398eb51d4575856d1a3c44df953, which replaced one -1 to QMetaType::QVariant too many times. It appears the use of -1 is rather deliberate here and not to indicate the use of a QVariant property. The attached test verifies this as well as the successful setting of the property at the end. Task-number: QTBUG-31576 Change-Id: I237ea08847e1db31481a311ea8ec23a5ccc702d8 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-122-3/+3
|\| | | | | | | Change-Id: I19a932141748119ccdc0a9cd9f926403f67f5968
| * Fix warnings found by clang: unused private membersThiago Macieira2013-06-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For qdeclarativebinding_p.h, since the class is private, there is no BC guarantee, so we can just remove the members. This class has a friend, but the friend is also in the same .cpp. qdeclarativebinding_p.h:139:14: error: private field 'm_object' is not used [-Werror,-Wunused-private-field] qdeclarativebinding_p.h:140:9: error: private field 'm_index' is not used [-Werror,-Wunused-private-field] For QSGGeometry, since this is a public class, we can't remove the members. Just make them unused. qsggeometry.h:124:11: error: private field 'm_reserved_pointer' is not used [-Werror,-Wunused-private-field] qsggeometry.h:127:10: error: private field 'm_reserved_bits' is not used [-Werror,-Wunused-private-field] Change-Id: Ia3650f38f32bd4cd705078a69c5445c64883bce4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-042-2/+2
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I9d0d430d894c4ba1409e19ff9244cf94937eb021
| * Fix VS2010 compile warningAlan Alpert2013-06-041-1/+2
| | | | | | | | | | | | | | | | | | warning C4510: 'QQmlPrivate::RegisterCompositeType' : default constructor could not be generated Backport of a11f4e4318b3b9d04faf533b68809937fb2208e2 from qtdeclarative Task-number: QTBUG-30454 Change-Id: I16ec8995ac1df3c92353006473ca082c4ed4e5b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Edited copyright headerTeemu Kaukoranta2013-05-301-1/+0
| | | | | | | | | | | | | | Removed deprecated "all rights reserved" string Change-Id: Ib407aa8eee6e529bd5a59d152589e4231d5d979f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-234-14/+94
|\| | | | | | | Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8
| * Move exports conflicting with QtQml into namespaceKai Koehne2013-05-134-14/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move exported qml* symbols that conflict with QtQml into an - automatically imported - namespace. This ensures apps can link against both QtDeclarative and QtQml. To keep the BC promise the old symbols are still exported. Task-number: QTBUG-29584 Change-Id: Icf4e586fee51d2bd82125398e2bb96d6dd355cc5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-031-2/+4
|\| | | | | | | Change-Id: Iec94e513079426e5d87bdd24753863038cee573e
| * Doc: Fix faulty code snippet in QDeclarativeEngine class referenceTopi Reinio2013-04-021-2/+4
| | | | | | | | | | | | | | | | | | A common way to access the engine instance is via QDeclarativeView - fix the code snippet accordingly. Task-number: QTBUG-20747 Change-Id: Iff837f834ca6c950aa6c78c418f544789b4fcaf9 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Backport some enum optimizations from Qt 5Alan Alpert2013-03-261-11/+33
|/ | | | | | | | | | Saving the int when we check the enum is valid allows us to make it a literal assignment instead of a binding, which is much faster on object creation. Change-Id: Ieb174289438a17574c4716df372b04d4dee6d0da Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix warning about extended date/time range in Qt 5.Friedemann Kleint2013-03-152-11/+11
| | | | | | | | | | Store the qint64 julian day in 2 ints, allowing Qt Quick1 applications to work until approx 2.5 Quadrillion AD. Task-number: QTBUG-28119 Change-Id: Id9cbcd8f01fb15e3eef13609e96d107b48b3ad9b Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unused variable (CLANG).Friedemann Kleint2013-03-061-2/+0
| | | | | Change-Id: I74d07deb862ff7099eaeeae93b04be3c7496c5c8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2830-118/+0
| | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Remove export-declaration from inline function qmlRegisterType().Friedemann Kleint2013-01-281-1/+1
| | | | | | | | Fix MinGW-warning about invalid dllimport-directive. Change-Id: I12b2888c09de5b548fd3bd7e626717ee057de80c Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17146-457/+147
|\ | | | | | | Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-10143-145/+145
| | | | | | | | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 04:12:16 +0000