summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Make more ctors explicitMarc Mutz2016-03-072-2/+2
| | | | | | | | | | | 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-072-3/+3
| | | | | | | | | | | ... 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>
* 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>
* 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-172-3/+3
| | | | | | | | | 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>
* Update copyright headersAntti Kokko2015-02-2363-441/+441
| | | | | | | | | 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>
* 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>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2563-1197/+693
| | | | | | | | | - 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>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-06-031-1/+1
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/declarative/qml/qdeclarativemetatype.cpp Change-Id: I133752e1df91677925005fa8c1268b32fba312ea
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-111-1/+1
|\| | | | | | | 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>
* | whitespace fixesOswald Buddenhagen2014-02-2024-129/+129
|/ | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove QtAlgorithms usage from QtQuick1.Friedemann Kleint2013-09-261-1/+3
| | | | | | | | 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>
* Fix a bug where completed was emitted twice when duration was zero.v5.1.0-alpha1Thomas Kristensen2013-03-261-4/+0
| | | | | | | Change-Id: I72c16f3affb297985e9e5d2e9f524537212d06ad Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-2/+2
|\ | | | | | | Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
| * Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | In automated GUI test scenarios it often desired not to wait for animations before verifying a result, so setting the duration to zero should accomplish this, before this patch; if duration was set to zero QSmoothedAnimation would treat it as if duration was not set, and used velocity to calculate animation speed. Change-Id: Ie6520d6c595bd014f3cab69bbb527e773f3850da Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-1/+1
|\| | | | | | | Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
| * make use of qtHaveModule()Oswald Buddenhagen2013-01-281-1/+1
| | | | | | | | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2827-107/+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>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1063-63/+63
| | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix some warnings in qtquick1 found by ClangThiago Macieira2013-01-041-2/+2
| | | | | | | | | | | qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess] qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value] util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member] qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter] qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags] Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Silence the Clang warning about overloaded virtual shadowing a previousThiago Macieira2013-01-041-0/+11
| | | | | | | | | There are a couple virtuals that are being overridden intentionally. We can't raise the previous virtual because they are privates. So the only thing we can do is disable the warning. Change-Id: Ie9c02e5d5a02d35c4cd7712c554be6e5cf5523a7 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Remove references to QApplication::type()J-P Nurmi2012-11-221-2/+2
| | | | | | | | Qt3 legacy QCoreApplication::Type and QApplication::type() will be removed -> use qobject_cast instead. Change-Id: If95a5552440ace2592332de03f9d2240fa8770b9 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Change the header message: this is now the QtDeclarative moduleThiago Macieira2012-10-1963-63/+63
| | | | | Change-Id: I18a370a58494049939d035f1c3528406f3f7645f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-1715-28/+28
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2463-1512/+1512
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Register Qt 4.7 import on-demand, instead of at startup.Robin Burchell2012-09-032-65/+76
| | | | | | | | | | | | | | | | | | | | This is a slightly less awkward approach (keeps backwards-compatibility) while speeding up startup for applications that don't use the old import path. Also prints a warning to let developers know they should migrate their code when possible. Completely disabling the Qt 4.7 import is still possible by setting QT_NO_IMPORT_QT47_QML. This takes around 10-15ms off a very simple "hello world" on my macbook. As an added bonus, forward-port a similar approach to 4.8's a26f545d8e25af74fb43d16c9afa79f6e04463e7 and don't register graphical types in a non-graphical application as someone (very naughtily) apparently forgot to get it integrated to Qt 5 first. Change-Id: I7821523750b3ab6770f367788725d0da70c5ec1f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-3017-33/+66
| | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: I017822524de1879d272d777ec7681f4233128b01 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove obsolete use of Q_WS_QWS.Stephen Kelly2012-07-271-1/+1
| | | | | Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* remove double-string-double conversion from QDeclarativeListModelFlorian Hänel2012-07-241-4/+7
| | | | | | | | | we do a double-string-double conversion in QDeclarativeListModel which introduces precision errors if that conversion is lossy, e.g. ecvt. is used Change-Id: Ie871ebbb04695f56fc7b49b9d788037da4a857c0 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* QtQuick1: Fix warnings about QWeakPointer usage.Friedemann Kleint2012-06-132-8/+8
| | | | | | | | - Use getPointer to get a weak pointer for the binding. - Change QWeakPointer<QObject> to a QPointer. Change-Id: I6c362a51c398f73817b5f4545d21f4845d625e13 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Quick1/QDeclarativeFontLoader: Output warning on failure.Friedemann Kleint2012-05-221-0/+2
| | | | | | | | | Helps in case the 'file::' prefix is missing from local file URLs on Windows. 'C:\foo' is then interpreted as URL with protocol 'c', causing an error. Change-Id: Ib6f4b096bbd1daf0fbc2d58aef714d131e52ef92 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Doc: Fix \sa usageMarius Storm-Olsen2012-05-102-4/+4
| | | | | | | | Ensure comma between elements (9 missing), single space and curly- braces around title elements, etc. Change-Id: Iefe491665804861f2a179ca87fb2f8a0eded8781 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QtQuick1: Fix deprecation warnings.Friedemann Kleint2012-05-021-2/+2
| | | | | | | Introduced by qtbase:0df1c9f1fa04c06d6105de3f312c6c752a58ad70 Change-Id: I61e330707a49efd09bad0efda386712fba207c8a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-139-176/+176
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Define Q_QUICK1_EXPORT independentlyMatthew Vogt2012-02-2715-25/+28
| | | | | | | | | | | | Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the qtquick1 module rather than using the definition in qtbase. This change undefines the definitions from qglobal.h; the undef should be removed once the definitions have been expunged from qtbase itself. Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix build issues related to QT_NO_*MODULE* defines.Andrew den Exter2012-02-221-3/+3
| | | | | | | | | | The QT_NO_XMLPATTERNS and QT_NO_CONCURRENT defines don't exist in Qt5 check for the existance of the modules with QT_XMLPATTERNS_LIB and QT_CONCURRENT_LIB instead of their absence with the old defines. Change-Id: I52bc9932294fe4564e58d06766301e2a0c41f15c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix license header format.Matthew Vogt2012-02-0763-126/+63
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-0763-63/+126
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-3116-45/+45
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-3064-0/+22662
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 00:17:17 +0000