aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * Ensure the cursorRectangle is updated as the width of the text changes.Andrew den Exter2013-02-011-0/+8
| | | | | | | | | | | | | | | | | | | | Outside of when of a monospace font is used, if the text changes the visual position of the cursor will have most likely changed as well even when the cursor index hasn't. Task-number: QTBUG-28677 Change-Id: If8077772d8541a677d5875976e6cd9fc453731df Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Ungrab mouse when FocusAboutToChange instead of LeaveFrederik Gladhorn2013-01-244-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7b2e2117162594a2d0234bb02408f5b5a446488b introduced a regression in mouse handling: When moving the mouse out of the window it would cancel all further mouse events. That is actually not wanted (eg scroll bars). Instead ungrab the mouse when the focus changes, that means the mouse handling with popups works and the scrollbar use case is also fixed. All the tests related to this seem quite timing sensitive, so try some more QTRY_VERIFY. Remove the parallel_test so that more cpu time will actually let the tests pass more reliably. Change-Id: I90586b05f461d3762728a466d71bcb967e03d14b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix alignment of Text element with implicit sizeEskil Abrahamsen Blomfeldt2013-01-241-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | In change e1d6b323d474acc5cd70fd9a0b283326316f55a0 there's an optimization which disables layouts on the QTextDocument, but the layout has to be re-enabled before we can call idealWidth() since this will be zero as long as the page size is 0x0. We simply set the page size to undefined again before calling idealWidth. Task-number: QTBUG-29262 Change-Id: I6bebe7be4c99fce0de8fc4178b5e1abc81abbe87 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
| * Disconnect from previous loading image when loading a new image.Michael Brasser2013-01-242-0/+77
| | | | | | | | | | Change-Id: If2fa95d9715a55d3f07ecf5f232e4f4b9a44a6fb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Stabilize tst_qquickpositionersGunnar Sletta2013-02-071-80/+45
| | | | | | | | | | Change-Id: I41e37493d5e1a6569beb5a26d6f2033a546af4b4 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Stabilize tst_qquicktextinput::remoteCursorDelegate()Michael Brasser2013-02-011-1/+1
| | | | | | | | | | | | | | | | | | In some cases QCOMPARE(component.status(), QQmlComponent::Loading); (line 2800) is failing -- it appears to be Ready immediately. Add a delay to ensure it always hits Loading before Ready. Change-Id: I975f3b3ea6004f178a7b0fb21193dcbdaf483157 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Reenable tst_QQuickItem::simpleFocus and fix warnings.Gunnar Sletta2013-01-311-4/+2
| | | | | | | | | | | | | | | | | | | | | | As a result of 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763, the simpleFocus test now passes on Mac and can be reneabled. I also took the liberty of making sure windows have a valid geometry, so that we don't get tons of warnings. Task-number: QTBUG-24094 Change-Id: I5b8bc82f3f5397110f6e487898d511e810bae59d Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Allow aligning items in a gridFabian Bumberger2013-01-282-1/+131
| | | | | | | | | | | | | | | | This change introduces two new properties, horizontalItemAlignment and verticalItemAlignment to a Grid element. This gives the user the possibility to align the items. Change-Id: I7322a689f1bbc1da342bd618f6c30dd8c139ee29 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Move the model classes from QtQuick to QtQmlAlan Alpert2013-01-249-257/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for proper support of non-GUI instantiators in QtQml. Only private C++ classes are affected. Aside from name changes, model classes now operate on QObjects instead of QQuickItems, leading to minor changes in the implementation of QtQuick classes using them. The old QML type names will still be registered in the QtQuick import for the forseeable future, but pointing to the new classes. The new QML types will be added in a second commit. Classes Affected: QQuickVisualDataGroup -> QQmlDataGroup QQuickVisualDataModel -> QQmlDelegateModel QQuickVisualItemModel -> QQmlObjectModel QQuickVisualModel -> QQmlInstanceModel QQuickChangeSet -> QQmlChangeSet QQuickListAccessor -> QQmlListAccessor QQuickListCompositor -> QQmlListCompositor QQuickPackage -> QQuickPackage (just moved for now) Change-Id: Ia19e630e53bfa9e5d459e289596cd11df1ea3930 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Move ListModel and ListElement to the QtQml importAlan Alpert2013-01-2422-110/+109
| | | | | | | | | | | | | | | | | | | | | | | | They're already in the QtQml module, but were left in the QtQuick import because they were considered to be of minimal use without QtQuick types. QtQml types are being developed would could make ListModel useful without QtQuick, indicating that they should no longer be considered QtQuick depedent. Change-Id: I31499f2cc23baf4bc70fb451ba164408bed89ff6 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-233-1/+21
|\| | | | | | | Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
| * Stabilize QQuickTextEdit testFrederik Gladhorn2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | tst_qquicktextedit::remoteCursorDelegate was failing because the test server served the the remote file too fast. It seems like the test relied on a slow machine to run it. Instead pass the Delay option to make the server serve the file delayed. Change-Id: Id99feea07f2da3b2ea0aa6c07e9b548e8f81f18b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Fix crash in PathViewTasuku Suzuki2013-01-182-0/+20
| | | | | | | | | | | | Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3 Task-number: QTBUG-29176 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Complete rewrite of threaded render loop.Gunnar Sletta2013-01-188-206/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Merge branch 'stable' into devGunnar Sletta2013-01-17587-590/+5384
|\| | | | | | | | | | | | | | | Conflicts: src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
| * Merge branch 'release' into stableGunnar Sletta2013-01-171-1/+1
| |\ | | | | | | | | | Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
| | * 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: I9adda2d147a05eb7acb3a864c81b8d0c0333c8bb Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-10576-576/+576
| | | | | | | | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | tst_bic: Add test data for linux-gcc-ia32Sergio Ahumada2013-01-101-0/+4622
| | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-321 Change-Id: I40505af8c579710c3252c9680287eda86bfbf165 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| * | make use of qtHaveModule()Oswald Buddenhagen2013-01-108-10/+10
| | | | | | | | | | | | | | | | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Test case for tapping on stacked mouse areasDaniel d'Andrada2013-01-092-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | Shows bug where the bottom mouse area could get a double click event out of a single tap. Change-Id: I4907a1506db2b4ccc5299d698c6e05fd02db963c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Flickable: Test case for flicking twice using touchesDaniel d'Andrada2013-01-092-0/+92
| |/ | | | | | | | | | | | | | | | | | | | | | | When you flick twice in rapid succession, in the same direction, the expected behavior is for flickable to be moving quite fast in the direction of the flicks. This test check for a bug where when you flick using touch events instead of mouse ones, the second flick causes Flickable to immediately halt. Change-Id: I430515d82499b904a1d2e23402b753873490a2d9 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * Fix tst_qquicktextinput on Windows and Mac.Friedemann Kleint2013-01-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Both require a sensible window size. Task-number: QTBUG-23485 Task-number: QTBUG-28611 Change-Id: If888dd4d60fccdabc9856f914d6542ced6a41d64 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | Do not force focus for non-focused windows.Gunnar Sletta2013-01-175-2/+10
| | | | | | | | | | | | | | | | | | | | If a QQuickWindow comes to screen but is not the focus window, such as if it is a child window of another window, it should not have focus by default. Change-Id: If9015bbc179bb101178b3bc8de176a1c71c46023 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Disable the QQuickFlickable test in CI.Gunnar Sletta2013-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | Test failures in this test has been popping up randomly in several different changes. It is poorly written with use of qWait()'s and QCOMPARE instead of using the more robust QTRY_COMPARE and QTRY_VERIFY. Change-Id: Ib56d7b2554b22fa9af767be31f1f181983ed60c7 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Make numeric-literal parsing even more robust.Erik Verbruggen2013-01-162-1/+3
| | | | | | | | | | | | | | | | The numeric value could overflow a unsigned 64-bit integer, so instead just buffer the string and have libc's strtod handle all the conversion. Change-Id: I220e490ddc22363460b0df65a91b47336e747310 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Fix automatic semicolon insertion before ++/-- operators.Erik Verbruggen2013-01-113-0/+28
| | | | | | | | | | | | | | | | Also move the tilde token from isBinop to the lex method, because it is not a binop, but should still be delimited. Change-Id: I532260f4f3ebdde2d38128b41d11bce5a113d1f1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Make numeric-literal parsing more robust.Erik Verbruggen2013-01-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | For cases where large non-fp numeric literals might end up triggering coversion or rounding errors when stored as doubles when lexing. This is a corner case, but it does trigger a case or two in the ECMA5 test suite (test262). Change-Id: Ie6d355e28379aba9a339c4e345b5d2a0c32d5fdd Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Marking test qquickanimations insignificant on mac.Erik Verbruggen2013-01-111-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-29062 Change-Id: Ie4c1de6ceb0e220d7c4f545ffbb14eeb44d0cc03 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Reenable temporarily skipped QML testsPeter Varga2013-01-092-6/+0
| | | | | | | | | | Change-Id: I1e57b0e39c539648602cc480e296db6c6948ff39 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Update some QML tests and temporarily skip themPeter Varga2013-01-092-15/+11
| | | | | | | | | | | | | | | | | | | | These tests should be skipped until the next V8 update is landed into QtJSBackend. The expected results of these tests currently check wrong behavior. These bugs have been already fixed in the official V8 thus we need to update and skip them until the fix is landed into QtJSBackend. Change-Id: I77d8ee50b45cd6599cbb5735ddef7d1461aeceab Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Fix semicolon insertion before pre-incr/decr operators.Erik Verbruggen2013-01-083-0/+82
| | | | | | | | | | | | | | | | Do not insert a semicolon if the previous token was a binop or a question mark. Change-Id: Id2ee1d3cb57fa3fe20bfc0078d06f9e2619d88f1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix unicode escape sequence validation in strings.Erik Verbruggen2013-01-084-3/+11
| | | | | | | | | | | | | | | | | | Give an error message when the sequence does not conform to the grammar. Note that both \u and \x (without any numbers following it) are not valid escape sequences in ECMA5.1. Change-Id: I14348984c680b0ce86e05faad5630afc1e98cd02 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge "Merge branch 'stable' into dev" into refs/staging/devFrederik Gladhorn2013-01-0789-427/+408
|\ \
| * | Merge branch 'stable' into devFrederik Gladhorn2013-01-0489-427/+408
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/parser/qqmljskeywords_p.h sync.profile tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
| | * Revert "Mark autotest as insignificant on mac"Paul Olav Tvete2013-01-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underlying bug was fixed by change I3b361655e25b6cf2d5e29410dc1f3567ab8f54d9 This reverts commit d355a609d4a314657a585be4750d2ed375c621a5. Change-Id: If01675097544a0271130dcbb7959ccf2425620c2 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | * Quick tests: Introduce QQmlMessageHandler.Friedemann Kleint2012-12-2014-204/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QQmlMessageHandler class that can be used to record messages into a QStringList. It also makes sure that the old message handler is reinstalled if the test fails. Task-number: QTBUG-28611 Change-Id: I0fff7bc11e188cf47178d9573e5f2eead693bc10 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * Fix compiler warnings in declarative tests.Friedemann Kleint2012-12-2012-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unused variables - Missing enumeration values in switch - truncation from double to float - truncation from size_t to int - Missing initializers - Mix of operator & and bool | Change-Id: Ib212aeea41befef193f12300a1d9814a60f183af Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Do not crash on some animation changesAlbert Astals Cid2012-12-201-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop() might end up deleting the animationjob object so wrap the call with a RETURN_IF_DELETED Fixes valgrind complaining ==18380== Invalid read of size 1 ==18380== at 0x5530B24: QAbstractAnimationJob::setCurrentTime(int) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x5530BDE: QQmlAnimationTimer::updateAnimationsTime(long long) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x65C05DC: QUnifiedTimer::updateAnimationTimers(long long) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x65C10E3: QAnimationDriver::advanceAnimation(long long) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x5047DB9: QQuickRenderThreadSingleContextWindowManager::event(QEvent*) (qquickthreadedwindowmanager.cpp:588) ==18380== by 0x58D7F9B: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Widgets.so.5.0.0) ==18380== by 0x58DB364: QApplication::notify(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Widgets.so.5.0.0) ==18380== by 0x6756B9D: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x6758855: QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x679E7C2: postEventSourceDispatch(_GSource*, int (*)(void*), void*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0) ==18380== by 0x85B7AB4: g_main_context_dispatch (gmain.c:2715) ==18380== by 0x85B7DE7: g_main_context_iterate.isra.24 (gmain.c:3290) ==18380== Address 0x1642bd48 is 88 bytes inside a block of size 128 free'd ==18380== at 0x4C2A44B: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==18380== by 0x4F0728B: QQuickBehavior::write(QVariant const&) (qquickbehavior.cpp:210) ==18380== by 0x53EB0FE: QQmlVMEMetaObject::metaCall(QMetaObject::Call, int, void**) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x54FEA08: StoreProperty(QV8Engine*, QObject*, QQmlPropertyData*, v8::Handle<v8::Value>) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0) ==18380== by 0x79ED2CE: v8::internal::JSObject::SetPropertyWithCallback(v8::internal::Object*, v8::internal::String*, v8::internal::Object*, v8::internal::JSObject*, v8::internal::StrictModeFlag) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x7A0AE71: v8::internal::JSObject::SetPropertyForResult(v8::internal::LookupResult*, v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x7A0B2D8: v8::internal::JSReceiver::SetProperty(v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag, bool) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x79A8861: v8::internal::StoreIC::Store(v8::internal::InlineCacheState, v8::internal::StrictModeFlag, v8::internal::Handle<v8::internal::Object>, v8::internal::Handle<v8::internal::String>, v8::internal::Handle<v8::internal::Object>) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x79A8DF0: v8::internal::StoreIC_Miss(v8::internal::Arguments, v8::internal::Isolate*) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0) ==18380== by 0x24E8BD20618D: ??? ==18380== by 0x24E8BD237AC9: ??? ==18380== by 0x24E8BD2249E6: ??? Change-Id: Idcb195206d344bb526ee37f9172a6b3c029540db Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | * Stabilize QQuickLoader test on Windows.Friedemann Kleint2012-12-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Wait until the component is ready in network tests. Task-number: QTBUG-28611 Change-Id: I3f880ee585199a3c8ba2d672bb365fa60c472499 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| | * Fix tst_qqmlbundle on Windows.Friedemann Kleint2012-12-192-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin was not found since it was in the Release/Debug subfolder, respectively. Task-number: QTBUG-28611 Change-Id: Ieaea7c67e2524a7d0ca3011d96f31b15929e551c Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | * Fix tst_qqmllanguage for MSVC.Friedemann Kleint2012-12-182-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use \u. Task-number: QTBUG-28611 Change-Id: I85fce2f945c97421b8b35fb8276cd4ee3cc19d38 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I6cefdd70ffd3a0ef889752eafec8b999822588cf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf and dll by qt_module.prf. Change-Id: I449e49275622bac39b7d76af8855c417ddce21e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Add a hidden XandYAxis enum valueAlan Alpert2012-12-1511-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently follow capitalization rules. Add an undocumented XandYAxis variable to ease porting. Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| | * Move the Q_DECLARE_METATYPE to where it should be.Stephen Kelly2012-12-112-1/+1
| | | | | | | | | | | | | | | Change-Id: Id17b30ed59fd9e68229bb80de5b9e4bc2aa0b75d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * make use of qt_headersclean.prfOswald Buddenhagen2012-12-112-57/+2
| | | | | | | | | | | | | | | Change-Id: I50f2299573770bb546333f57a61b6eb6b7e80e4e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Only free context if the owning QV8ContextResource gets destroyedPhilip Lorenz2012-12-101-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since fdeee38b781376012c4f086276c3c376726c8839 QQmlXMLHttpRequest stores the calling context for later use. This leads to issues after the first request completes and the wrapping QV8ContextResource gets freed by garbage collection and therefore removes the associated QQmlDataContext which may still be required for later calls (e.g. if the calling context is part of a stateless library). This patch introduces an ownership flag for QV8ContextResource which indicates if the associated context should be cleared when the object is destroyed. Task-number: QTBUG-28351 Change-Id: I552ebb5c55b889eb33f3884283c8fdf037ac33be Reviewed-by: Alan Alpert <aalpert@rim.com>
| | * Mark autotest as insignificant on macPaul Olav Tvete2012-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This test blocks unrelated changes from getting through the CI system. Task-number: QTBUG-28505 Change-Id: I514b449ddd4cfc7c4f2fdb011b8910838aeabac7 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | * Stabilize tst_qquickpathviewAlan Alpert2012-12-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The complete flick is already a long operation, so when it's delayed due to heavy system load it can exceed 5s easily. Increase the timeout to give the flick time to finish. Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>