summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia89f74de1281f7357cfa75b22b6d43e83b032ab2
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ie118f79e690ba82f6bc6410c3e8158d57f710060 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Fix QML file in wigglytext-example.Friedemann Kleint2013-11-221-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-33871 Change-Id: I0dcd1fa10d82b929161afb044867983675064247 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-1/+6
|\| | | | | | | Change-Id: I2c6a554f6033ce83379f2338fd3064ab39674215
| * Debugger: Fix debugging with newer Qt Creator'sv5.2.0-rc1Kai Koehne2013-11-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we advertise the QDataStream version, so that Qt Creator doesn't fall back to Qt_4.7. This is the minimal change necessary to achieve this. QtQml does actually consider the maximum data version announced on the client side, but that would require bigger changes in this module ... Task-number: QTCREATORBUG-10694 Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0828-32/+36
|\| | | | | | | Change-Id: I6556b93b0897a2df48a68238b8ab150541fcbb3f
| * tests: fix tst_qdeclarativemoduleplugin::incorrectPluginCase()Liang Qi2013-11-011-3/+7
| | | | | | | | | | | | | | | | | | It gives different error message based on the case sensitivity of the file system on Mac. Task-number: QTBUG-32646 Change-Id: I8b5986a4bc8886924e678692c6679e571a11dd33 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | | | | | Change-Id: Ia64fcacff77933a00df6eecd866f75466f4f99a3 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * tests: replace nokia with qtproject in tst_qdeclarativemodulepluginLiang Qi2013-10-3127-30/+30
| | | | | | | | | | Change-Id: Ia531065e3069aa010f99f91a8c8228788b3f0848 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-1/+1
|\| | | | | | | Change-Id: I636400c00ec6470d4dff4844a977ef0f5aa3a53b
| * tests: Replace Q_OS_MACX -> Q_OS_OSXv5.2.0-beta1Sergio Ahumada2013-10-211-1/+1
| | | | | | | | | | | | | | | | Use the correct identifier for the OS X operating system. Change-Id: I5f93d63fc7e3041a45485ca10ccf5a1bde04bb01 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Bump qtquick1 version to 5.3.0Thiago Macieira2013-10-141-1/+1
| | | | | | | | | | | | Change-Id: I5d94fe1e2fde1ff898afbd9da93f77deeb0a1769 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-116-8/+12
|\| | | | | | | Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933
| * remove stale phonon referenceOswald Buddenhagen2013-09-302-4/+0
| | | | | | | | | | | | Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Remove QtAlgorithms usage from QtQuick1.Friedemann Kleint2013-09-264-4/+12
|/ | | | | | | | 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>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Sergio Ahumada2013-09-18187-28/+32
|\ | | | | | | Change-Id: I46b53c8d8aaed59e548ccb8cadb60afd00ca7aa6
| * Doc: Move Qt Quick 1 demos and their documentationold/5.1Topi Reinio2013-09-16187-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing the examples, we currently end up with a QT_INSTALL_EXAMPLES/demos directory with nothing but documentation files. This change moves the docs and also the demos themselves into examples/declarative/demos. Also fixes the links in demo .qdoc files. Task-number: QTBUG-31722 Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-1/+0
|\| | | | | | | Change-Id: I061a46a31c7e16386a2040b4777bc797aaa635e2
| * Fix compilation for -no-opengl buildKai Koehne2013-09-041-1/+0
| | | | | | | | | | | | | | shadereffects is already included conditionally a few lines below. Change-Id: I8fd0a244708b0c5a820a0edc0fc9c9ce2e5513c0 Reviewed-by: Alan Alpert <aalpert@blackberry.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>
* | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
| | | | | | | | | | Change-Id: Ic463237518c930fe367d0458859caa0050f45929 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Doc: several updates to the module page.Jerome Pasion2013-08-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 1)Setting \qtvariable in module page. \qtvariable indicates the QT variable needed in .pro files. 2)WS fixes. Qt Quick 1 is deprecated but it is still nice to update the module page. Change-Id: I5358a03566589a6910469c0bbd4a717e90be1c34 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-055-111/+136
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6
| * Keyboard input documentation: an event accepted does NOT bubble upJeremy Katz2013-07-311-2/+2
| | | | | | | | | | | | | | | | Add missing negation for the code snippet demonstrating accepting a key event Change-Id: Ia4c1cc4f207df9fb6e041ff088c6da2a63cd47b9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Fail tst_qdeclarativeborderimage::mirror() on Windows.Friedemann Kleint2013-07-291-1/+5
| | | | | | | | | | | | | | | | | | As expected. The test was using an invalid URL and thus successfully comparing 2 empty images. Task-number: QTBUG-32661 Change-Id: If6f0ad23454673b4b4fb2bc0a73da2b50663f171 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+26
| |\ | | | | | | | | | Change-Id: I23fb0ae0d08e0cdcda7d17c70cb19f1e499e1475
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-241-0/+26
| | | | | | | | | | | | | | | | | | Change-Id: I9062104d41ad4a4af352dc6366f550c09b3d8ebd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Stabilize and fix tst_qdeclarativetextedit.Friedemann Kleint2013-07-251-49/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a scoped pointer for the views to ensure cleanup after failing tests. Fix calculation in positionAt() to use a QPaintDevice and the first line of the text. Move calls to QDeclarativeView::setFocus() below activation for it to set the "active" focus item correctly. Task-number: QTBUG-32538 Change-Id: Ibf10d00b9bddd587f5721d5b5011f6eafc617f39 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | Stabilize and fix tst_qdeclarativetextinput on Windows.Friedemann Kleint2013-07-251-59/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a scoped pointer for the views to ensure cleanup after failing tests. Clear text in maxLength(). Move calls to QDeclarativeView::setFocus() below activation for it to set the "active" focus item correctly. Add message to obtain more information about failing tests. Task-number: QTBUG-32538 Change-Id: Id65afbdfb0f9fd70846958fcb28fdd0fe1bd70f7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: I36783bb7f976375cbc9b64a371889a8784350110 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-2326-56/+84
|\| | | | | | | 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>
| * Change domain used in cpp-extensions-example.Friedemann Kleint2013-07-1810-13/+13
| | | | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: I373183e096390bd1564c2d263190fb9063a733a2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Fix regression from Qt 4 for deep group propertiesSimon Hausmann2013-07-174-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Replace qt.nokia.com by www.qt-project.org in tests.Friedemann Kleint2013-07-153-10/+10
| | | | | | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: I3662046e22c014618ba07b1c8fddda13ac09690a Reviewed-by: Leonard Lee <leonard.lee@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Fix organization domains.Friedemann Kleint2013-07-152-4/+4
| | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: Ibaeb0b1ad2ee7b446252fc5e5984c78dbb909a3f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Replace www.nokia.com by www.qt-project.org in tests.Friedemann Kleint2013-07-127-28/+28
| | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: Iad6471698c31ff24cc622456d5d51a23af047780 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-0/+17855
|\| | | | | | | Change-Id: Id822cb4487136926c8a3a3f54f6a978e8592c6ac
| * test: Add 5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-081-0/+17855
| | | | | | | | | | Change-Id: I652230600a169be519387cfe147693efd621399c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-272-8/+37
|\| | | | | | | Change-Id: I00ecf95f451bfe78507b3c2cf6634e71d4a5a451
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-202-8/+37
| |\ | | | | | | | | | Change-Id: Ie3ba29b032c149795efb6abd91b2d65e6e666540
| | * Add changes-5.1.0 filev5.1.0-rc2v5.1.0Sergio Ahumada2013-06-191-0/+28
| | | | | | | | | | | | | | | Change-Id: I93db177fbc1309033b06be11dadee7580b03e8f3 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * qmlplugindump1: make it behave more like qmplugindumpv5.1.0-rc1Fawzi Mohamed2013-06-101-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | * use -nonrelocatable as flag * always emit meta object revisions Change-Id: I8bab4e4faf458f403dbfdc9e6c11c0ad17c27295 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-123-3/+5
|\| | | | | | | | | | | Change-Id: I19a932141748119ccdc0a9cd9f926403f67f5968
| * | Fix warnings found by clang: unused private membersThiago Macieira2013-06-103-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-048-20/+53
|\| | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-312-6/+8
| |\| | | | | | | | | | Change-Id: I5c5246ef6c3028118bac4f3d19fdfda5bd52799d
| | * make use of qt_app.prfOswald Buddenhagen2013-05-281-5/+2
| | | | | | | | | | | | | | | Change-Id: Ibb906772daf7a6bc6d56874db0a4ced2cafa67a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * adjust to new "configure -nomake tools" semanticsOswald Buddenhagen2013-05-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | this also reverts f47715f0a4 on the way, as this should make it obsolete. Change-Id: Ib54177b35f2378d7e6df497f546a8c4f19d00914 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:22:11 +0000