summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| * | Fix warnings for QtQuick1Thiago Macieira2013-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | qpacketprotocol.cpp:299:12: error: variable "writeBytes" set but not used [-Werror=unused-but-set-variable] Change-Id: I04a33119b30669dda688591aee60dcb2b7bbd41b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | 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>
| * | Fix a bug where completed was emitted twice when duration was zero.v5.1.0-alpha1Thomas Kristensen2013-03-262-4/+20
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-03-262-2/+2
| | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I55a678dce0cfe84871d3bd2de10a5df2465bf08c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fixed some declarative auto testsBernd Weimer2013-03-273-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | This is a backport from qt5/qtdeclarative (commit c460a83 + a fix in qdeclarativeimage) Change-Id: I90f292dea76d3da30930a663b37f8e624b210c2b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-275-16/+25
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-265-16/+25
| |\| | | | | | | | | | | | | | Change-Id: I82c73a1924fa659312e4b34df2b038def2d8d959
| | * | Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5362a735a0982eedad071a307e1a423eaee57041 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Merge branch 'dev' into stableSergio Ahumada2013-03-19135-656/+292
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
| | * | Smooth dragging an item with MouseArea.Andrew den Exter2013-03-192-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculate drag distance relative to the mouse position when a drag is detected rather than the press position so there isn't a large change in position on the first move. Task-number: QTBUG-30188 Change-Id: I46918a7b3c62bdaef567b6a9fed651ce33434247 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| | * | Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-03-193-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression whereby on the first mouse move the contentItem was moved the total distance from the touch point to where the drag distance was exceeded. For large drag thresholds this causes a noticeable jump. Task-number: QTBUG-30032 Change-Id: I92c119d27dc2e22203484f9ada5978697d171957 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| | * | Merge branch 'release' into stableOswald Buddenhagen2013-03-181-0/+2
| | |\| | | | | | | | | | | | | Change-Id: I789c049c5cb8dbf654f993cd501b17bb80304f87
| | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I0dd628cdf63c13a8ac94213f2fc1b7d04df24786 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-211441-20104/+20752
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
* | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 17:37:44 +0000