aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make use of qtHaveModule()Oswald Buddenhagen2013-01-1015-18/+18
| | | | | | | 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>
* Fix PinchArea stealing events while disabledOleg Shparber2013-01-091-1/+1
| | | | | Change-Id: I8614431f11fc9ef1ecdbdeb1d37e4f4b1bb353a7 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Doc: Updated docs for examples and etcXingtao Zhang2013-01-0930-239/+246
| | | | | | | | | | | | - Corrected several \snippet paths and \example paths. - Added missing example images. - Marked several commands as code. - Updated the exampledirs variable for qtqml. Done-with: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Task-number: QTBUG-28898 Change-Id: I24aac17821f54de4bd5129c45b5bf96dc0f114b2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Fix bug where a tap over stacked mouse areas generates a double clickDaniel d'Andrada2013-01-092-5/+25
| | | | | | | | | | | | | You have two mouse areas, one on top of the other. 1 - You tap the top one. 2 - That top mouse area receives a mouse press event but doesn't accept it Expected outcome: 3 - the bottom mouse area gets clicked (besides press and release mouse events) Bogus outcome: 3 - the bottom mouse area gets double clicked. Change-Id: I10cac52b5e8edea781fe88e70c4092eb38bcf763 Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
* Flickable: Fix bug when flicking twice using touchesDaniel d'Andrada2013-01-091-0/+5
| | | | | | | | | | | | 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. But when you flicked using touch events instead of mouse ones, the second flick caused Flickable to immediately halt. This change fixes it. Change-Id: I02bd02fed30bd4a98959194e04f0a26b4420cd05 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix warnings about nonexistent signals in QQuickScreenOleg Shparber2013-01-091-10/+2
| | | | | | | | | | On application exit QQuickScreen tries to disconnect from an old QScreen which is almost destroyed at this point. Change-Id: I6c595cf68d6faaf3527b8ffcae0a074c23170ea1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Don't try to grab Windows with invalid or a zero sizeDominik Holland2013-01-081-0/+3
| | | | | | | | | | | It will end up in LiveLock trying it. Because the Window will never appear in the Rendering thread and setting the grabContent. On the other end, grabWindow will never return because it waits for the RenderingThread to set grabContent Change-Id: Ia1c365acf033732b3e2e9d9d7dc8e73f9e8f4870 Reviewed-by: Gunnar Sletta <gunnar.sletta@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>
* Documentation for scene graph examples.Gunnar Sletta2013-01-0713-68/+484
| | | | | Change-Id: Idb39fc0b6d5e538b90ae8a0b98d9f4d77e1fb617 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Accessibility: Send value updatesFrederik Gladhorn2013-01-042-0/+10
| | | | | Change-Id: I090dc8427e478416bf1bbe910db1f98d9bce3fb8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Modify qmlscene usage text to be consistentRichard Moe Gustavsen2013-01-041-4/+4
| | | | | | | | - last line was not aliged correctly with the previous lines. - usage of capital letter was inconsistent. Change-Id: Ied7caab8296a635e105764bc2e95aa9e78f1cfcb Reviewed-by: Alan Alpert <aalpert@rim.com>
* Accessibility: Work with QQuickWindowFrederik Gladhorn2013-01-044-29/+37
| | | | | | | | | | | Before we would only be accessible when QQView was used. While the window has the content item, that one will not appear in the hierarchy of accessible objects since it has no valueable properties to expose. Instead it's first child will be used (which was the case before when QQView was used). Change-Id: I03cefb5c8dcd8296d51ff2bfcb677386a5f1d698 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Improve example with key navigation.Frederik Gladhorn2013-01-044-31/+101
| | | | | | | Generally this is a redo of many of the details. Change-Id: I08c4f58966507232220bb10892041b9e39d54e37 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* 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>
* qmltest: Added the possibility to use QApplicationLiang Qi2012-12-312-6/+30
| | | | | | | | | | | Current QML test cases in QtDesktopComponents still need to use QApplication. Added QT_QMLTEST_WITH_WIDGETS define when QtWidgets is available. Also proveded a command line switch "-widgets" for it. Change-Id: Ib6c7313538cb8875144636b6f8bd264b0f13aa8d Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add changes-5.0.1 fileSergio Ahumada2012-12-241-0/+56
| | | | | | Task-number: QTBUG-26065 Change-Id: I3345a178cdfbc8e8c68b0e069eb9928772353186 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-232-8/+8
| | | | | Change-Id: I8cadaec38aff1348c80c552e7fe072b6a7aa31b1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix other warnings in qtdeclarative found by GCC 4.7Thiago Macieira2012-12-237-4/+9
| | | | | | | | | | | | | qml/qml/qqmlimport.cpp:982:30: error: unused parameter 'errors' [-Werror=unused-parameter] quick/util/qquickanimationcontroller.cpp:66:6: error: unused parameter 'job' [-Werror=unused-parameter]' quick/items/qquickshadereffectnode.cpp:160:17: error: case value '38' not in enumerated type 'QVariant::Type' [-Werror=switch] quick/items/qquickwindowmanager.cpp:286:60: error: 'renderTime' may be used uninitialized in this function [-Werror=maybe-uninitialized] quick/items/qquickitem.cpp:5267:67: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] and a few more repeated from the above Change-Id: Id1950c6ba98f7f8475975716b21bd795ecb4bd20 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix warnings in QtQml due to ?: with enums of different typesThiago Macieira2012-12-231-25/+25
| | | | | | | | The compiler was complaining a lot about: qml/parser/qqmljskeywords_p.h:400:57: error: enumeral mismatch in conditional expression: 'QQmlJS::Lexer::<anonymous enum>' vs 'QQmlJSGrammar::VariousConstants' [-Werror=enum-compare] Change-Id: Ib6acd3fbae048c33626321bf5e7ee8b50bb6b48e Reviewed-by: Alan Alpert <aalpert@rim.com>
* Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-211-0/+3
| | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I4c5488bdc146f501963f5414017ba80d781210ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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-202-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Compile with QT_NO_WHEELEVENT.Volker Krause2012-12-1916-1/+39
| | | | | | | | Change-Id: I2fbe6f45ba50e3db75bd02cfca47ddabfcd5fc49 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Accessibility: Improve interface handling in QuickFrederik Gladhorn2012-12-196-49/+90
| | | | | | | | | | | | | | | | | | This changes how interfaces are handled: the QAccessibleQuickItem will simply subclass all interfaces and dynamically return 0 or the appropriate interface_cast. This makes our implementation a lot more flexible. To make use of the value interface, only a value property is needed (together with a corresponding role). Since the implementation of the interfaces became simpler, the value interface and some text interface improvements go along with the change. Change-Id: I003ec3016d48d730a4acac467bce322167842f4d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.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>
* Doc: Enabling Qt QML linking to Qt Quick.v5.0.0Jerome Pasion2012-12-171-1/+1
| | | | | | | | Allows Qt QML pages to link to Qt Quick. Task-number: QTBUG-28579 Change-Id: I9eafadc5ee14a5588a5863960c4463132b73b287 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-162-2/+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-1613-14/+10
| | | | | | | | 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-1519-22/+22
| | | | | | | | | 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>
* Add minimal plugin importing to quick2 qmlplugindump toolMiikka Heikkinen2012-12-141-0/+2
| | | | | | | Task-number: QTBUG-28131 Change-Id: Iad55e3c6057b060cd8f8233e02a6151c91cc32ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed samegame tutorial part 4 to reflect Quick2 stateOliver Wolff2012-12-143-20/+28
| | | | | | Change-Id: I61a3d63bc0268256ff6497339a6d97719a59860f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Improved cosmetics for StockQtJens Bache-Wiig2012-12-138-45/+76
| | | | | | | | This will not get us any design awards but it looks a bit more professional than the original. Change-Id: Ib01a20ebad5888af44c174cbd493ce8d99dcf7b6 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Clean up the StockQt demoJens Bache-Wiig2012-12-1310-789/+726
| | | | | | | | | I cleaned up the whitespace, property declarations and removed some console output. No changes to the functionality or design. Change-Id: I499f6d061e43bf2e187eebc026858b3abd21a9b0 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix StocQt buttonsAlan Alpert2012-12-124-155/+124
| | | | | | | | They're now on screen and using better componentization for the styling. Task-number: QTBUG-28291 Change-Id: If21712e523c706ee05d257e209ed71dd61acf2dc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Update porting docsv5.0.0-rc2Alan Alpert2012-12-121-1/+10
| | | | | | | | | | | Some improvements to the QML engine in Qt 5 lead to behavior changes. These should be explained in the porting guide. Task-number: QTBUG-28411 Change-Id: Ifc4016cf7b33ba113dbe0cbabd2f71a4ff1a8685 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Bea Lam <bea.lam@jollamobile.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Change virtual folders in .qdocconf to qtqml and qtquickhjk2012-12-122-2/+2
| | | | | | | This seems more in line with the rest of the qdocconf files Change-Id: I91999205b0632a2c0e57f428754cf5928a1ea6c7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add \brief comment to Custom Geometry examplehjk2012-12-121-1/+1
| | | | | Change-Id: I11be2329d2d396bc778a5eeda45dda9b30337285 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Use resource files for most examplesKai Koehne2012-12-1299-160/+770
| | | | | | | | | Make examples shadow-build-friendly by using resource files instead of trying to derive the qml path from applicationDirPath(). Change-Id: I669424554c772d9b261249b366247190f5fbd8b1 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Work towards supporting front-to-back reordering of opaque items.Michael Brasser2012-12-122-10/+9
| | | | | Change-Id: Ic3b9defa6ac61409adcfb2b5cb8167698ed00255 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fixed abstractitemmodel exampleOliver Wolff2012-12-124-8/+13
| | | | | Change-Id: I1e85fd3f35f4f3d80e3fb599ae95b771db5f949b Reviewed-by: hjk <qthjk@ovi.com>
* Fixed install targets for model examplesOliver Wolff2012-12-113-0/+9
| | | | | Change-Id: I4c23fe37ec7adc17180c2405e68273b5cd3ee219 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Examples: Remove unused import "../shared"Kai Koehne2012-12-112-2/+0
| | | | | Change-Id: I3c84eab1ff97380362828aa96b0d5189cbd62509 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Removed leftover file from example cleanupOliver Wolff2012-12-111-18/+0
| | | | | Change-Id: I63b9ca28724d651d8e4cb74eed114665a75e8b18 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Improved the scene graph overview a bitGunnar Sletta2012-12-111-9/+48
| | | | | Change-Id: I82f5a48801b2c8ed94ef1f8d0b2e82998bb91c78 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.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>