summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
| * | 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>
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| |/ | | | | | | | | Change-Id: I97ba1994172ac32472a12eb3b82d1f22670e9232 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Update all plugins.qmltypes files except webviewLiang Qi2013-05-272-2/+27
| | | | | | | | | | | | Task-number: QTBUG-31388 Change-Id: I16a137190c6a1ddba196b0624ade67c1e7fd9eed Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Tools: unnecessary to make qmlplugindump a bundleLiang Qi2013-05-271-2/+7
| | | | | | | | | | | | | | | | Embed Info.plist in qmlplugindump executable in a special way. Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8 (cherry-picked from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004) Reviewed-by: Liang Qi <liang.qi@digia.com>
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-8/+9
| | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I9bc9d2df9ce434453c652ac97bb786e6400d5af1 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2397-3843/+296
|\| | | | | | | Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8
| * Move debugger plugins into separate qml1tooling directoryKai Koehne2013-05-224-4/+4
| | | | | | | | | | | | | | | | | | | | Separate the QML 1 and QML 2 debugger plugins. This helps avoid a nasty crash in libgobject when (uneccessarily) loading and unloading the wrong plugins. Task-number: QTCREATORBUG-9232 Change-Id: I0bce7b364fcce983ccaa531d9008609ff08bb77f Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
| * Cleanup and fix the Getting Started tutorialJ-P Nurmi2013-05-1581-3757/+159
| | | | | | | | | | | | | | | | | | | | The tutorial got messed up by 04cb8ef1. This change restores the core/ folder from within the gsQml/ backup folder and then deletes it. Task-number: QTBUG-31082 Change-Id: Ie18af90dbc70812dc7e74fdd1389a8734cf62fd4 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * iOS: fix build on iOSRichard Moe Gustavsen2013-05-151-1/+1
| | | | | | | | | | | | | | | | Currently, apps for iOS needs to be build through Xcode. So disable building tools for now, until a proper solution is ready. Change-Id: Ib31ad29d83c9043be94881e536975682adca4061 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * 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>
| * tst_qdeclarativeimage: it's OK to receive a network image in chunksShawn Rutledge2013-05-101-2/+2
| | | | | | | | | | | | | | | | | | and if so, there can be more than 2 signals to update progress. Task-number: QTBUG-31065 Change-Id: I36294eb8a40c0e8d4beac29a8484260d5cfe6e73 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Make sure correct files are bundled on Androidv5.1.0-beta1Eskil Abrahamsen Blomfeldt2013-05-031-0/+4
| | | | | | | | | | | | | | The imports must be bundled in the apk. Change-Id: I44cd4b442f9f3c8b6bf3534ffbfb8866475599e4 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Fix bic baseline dataJan Arve Saether2013-04-301-28/+3
| | | | | | | | | | | | | | | | | | | | | | Caused by https://codereview.qt-project.org/54820 I actually tried to avoid this with https://codereview.qt-project.org/54837 but my assumption was wrong. Change-Id: Ibf8ba1031a84745dfec65d300a73e10c6728393d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-35/+5
| | | | | | | | | | | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: I507b0af3888185a0cb86a3e71cab9115b9275892 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * test: Remove CONFIG+=parallel_test from tst_examplesSergio Ahumada2013-04-111-2/+0
| | | | | | | | | | | | | | | | This fails quite often on Mac because it gets mixed with the same test in qtdeclarative.git while testing qt5.git Change-Id: I58f3f9d8e64b080a2a78fdedb409acd68324c8f8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-0/+24
| |\ | | | | | | | | | Change-Id: Ia3d23c08fddda65432bb5b3e3c7889abf524d936
| | * disable module when widgets is not availablev5.0.2Tasuku Suzuki2013-03-221-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I3849f3dfb1d33bf15053fae864393d5755a2ea8d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+22
| | | | | | | | | | | | | | | Change-Id: I75fe0526bb3698cbbe6555cbb13eb32fd1bfa3c6 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-036-8/+27
|\| | | | | | | | | | | Change-Id: Iec94e513079426e5d87bdd24753863038cee573e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:56:55 +0000