summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge branch 'stable' into devSergio Ahumada2013-08-053-109/+108
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6
| * 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>
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-2313-40/+63
|\| | | | | | | Change-Id: I776abad2c248f697ff729057cfaff16b4a395380
| * Fix regression from Qt 4 for deep group propertiesSimon Hausmann2013-07-173-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-2/+2
| | | | | | | | | | | | 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-05-233-32/+5
|\| | | | | | | Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8
| * 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>
| * 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>
| * 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/stable' into devFrederik Gladhorn2013-04-033-2/+22
|\| | | | | | | Change-Id: Iec94e513079426e5d87bdd24753863038cee573e
| * Fix a bug where completed was emitted twice when duration was zero.v5.1.0-alpha1Thomas Kristensen2013-03-261-0/+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 branch 'dev' into stableSergio Ahumada2013-03-199-155/+89
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1410-42/+597
| |\ | | | | | | | | | Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
| * | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-131-151/+0
| | | | | | | | | | | | | | | Change-Id: I6fda0c0b8ce1b104b62cedf3ad71adadf6b4b3ea Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | Fix qdeclarativelanguage test for installed builds.Friedemann Kleint2013-03-132-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Compile failure due to auto-test-exported symbol qmlRegisterTypeNotAvailable(). Change-Id: Ia1ae312f1d7f8d3fcd93879780d01f7a8b1e0383 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-254-2/+236
| |\ \ | | | | | | | | | | | | Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
| * \ \ Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-1974-154/+78
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1874-154/+78
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
| * | | | | Fix QDeclarativeListView currentSection property updateNils Jeisecke2013-02-181-0/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Model modifications that did not trigger the refill logic caused the view's currentSection property to contain an outdated value. A new autotest has been added to catch the bug. Task-number: QTBUG-29712 Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-4/+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>
| * | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17149-18394/+17766
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
| * \ \ \ \ Merge branch 'stable' into devFrederik Gladhorn2013-01-1753-229/+806
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
| * | | | | | Add a method that allows registration of files to typesAlan Alpert2012-12-053-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288eab Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | | | | | Delay loading implicit importAlan Alpert2012-12-053-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a performance improvement to avoid accessing the filesystem unecessarily, only import "." implicitly if types cannot be found in the existing imports. This is not a behavior change for type resolution, because "." already has the lowest precedence for type resolution. Change-Id: I8a8f10f7a790e6a02fc2c07c443f7be1984fc979 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | | | | | Smooth dragging an item with MouseArea.Andrew den Exter2013-03-191-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-192-2/+8
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-132-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Fix warning about adding int to a QString (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If83018b1bd6dcaf7f8104fa9c4c3f4359062623e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | | Fix warnings about unused variables in tests (CLANG).Friedemann Kleint2013-03-114-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29d4a41d2b6c4ac5c7b27930257c3853500325a1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | | Improve emission of FocusScope focusChanged signals.Andrew den Exter2013-02-273-13/+540
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit activeFocusChanged up the focus tree when an item receives a focus event, rather than when the focusItem changes which happens before internal state is sufficiently updated for hasFocus and hasActiveFocus to return the correct values from within a changed signal handler. There are some limitions to this. First the signals are not emitted reliably when the scene is not active which makes sense for activeFocus but not for focus. The second is in some instances the focus and activeFocus can update unnecessarily while the focus chain sorts itself out. QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name> Task-number: QTBUG-28288 Task-number: QTBUG-25644 Change-Id: Ib3d17c42754c15a08b34c3388f50b45cc1d2a831 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | | Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-223-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the boundBehavior prevents the flickable from moving its content item in response to a drag it shouldn't grab the mouse as that will prevent a parent MouseArea or Flickable from handling the drag. Task-number: 29718 Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | | MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-222-0/+120
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A MouseArea shouldn't prevent a parent MouseArea or Flickable from handling a drag event unless it is going to do something useful with it. Task-number: QTBUG-29717 Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | Remove QPointerBase bic check.Stephen Kelly2013-02-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: I0c99526c56d4df0276965427d1cd5d89b574ecb7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Merge branch 'release' into stableSergio Ahumada2013-01-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
| * | | | test examples only in developer buildsOswald Buddenhagen2013-01-111-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I5c936a5b193aa575a0193dcf0968cce9c20c505f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | remove pointless conditionalsOswald Buddenhagen2013-01-3071-142/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not entirely clear why anything inside the declarative module would have a conditional on the presence of the declarative module ... Change-Id: Ie6e22840b6d1d63da90c7d02aedb14fd870191af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | make use of qtHaveModule()Oswald Buddenhagen2013-01-283-6/+6
| |_|/ |/| | | | | | | | | | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | tst_bic: Add linux-gcc-ia32 bic dataSergio Ahumada2013-01-152-0/+17622
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adding bic data for the following module: - QtDeclarative Change-Id: I9a6ab1e7b1f6bc5899fd2b0ba09bafd88c49744e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Remove the Qt 4 BIC data for qtquick1Sergio Ahumada2013-01-151-18158/+0
| | | | | | | | | | | | | | | | | | | | | We will not be testing BIC of Qt5 against Qt4 Change-Id: I4a19ca74b1f537e8ce2e0bd77120097967eb27c9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-10143-143/+143
| | | | | | | | | | | | | | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-093-93/+1
|/ / | | | | | | | | | | | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) Change-Id: Ife1dac4d6c46404b43253680819da21350c65569 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>