aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix QSGPlainTexture object leakLiang Jian2014-05-281-0/+1
| | | | | | | Delete m_texture in the destructor of QSGTextMaskMaterial class Change-Id: I0f3c59d2c5f094dcbc02eafa6ed782d16315eb44 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix tst_textinput.qmlBernd Weimer2014-05-281-9/+36
| | | | | | | | On platforms that have QT_NO_CLIPBOARD defined copy/paste/cut functions are not available. Change-Id: I28be021f45cd5a5fe8aaad2752d379c3eebea8cf Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QQuickWidget: Support drag and dropPaul Olav Tvete2014-05-271-1/+14
| | | | | | | | Relay drag/drop events to the offscreen QQuickWindow. Task-number: QTBUG-39167 Change-Id: Iaf59fb899d16ac96fc94f1df8c3a939e9bd0f92f Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Fix type of AnimationController::animation in documentation.Mitch Curtis2014-05-271-1/+1
| | | | | | Change-Id: I3122ba1d7e9f1c396bef347cd1fd7df8ab32ff47 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Photoviewer: Allow using the Android back button to go back.Niels Weber2014-05-271-1/+17
| | | | | | | | | Don't show back button on Android, as the system back button can now be used. Task-number: QTBUG-38122 Change-Id: Ia3a677f4626eaf34e23dfcc7997e4b850d8b7020 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Fix compilation on MSVC 2008Simon Hausmann2014-05-271-5/+16
| | | | | | | | | | | | | | | | | We are using std::lower_bound on a vector where the item we search for is of a different type than the items in the container. MSVC 2008's STL is very happy to check all sorts of constraints and also compare the order of items within the container. That means it tries to call the compare function not only with the key we're searching and one item but also two items from the container. The existing compare function can't satisfy that constraint, so instead we'll go back to the old approach of a proper functor that operates outside of the class scope, in order to build with older compilers. That functor now offers all necessary overloads. Task-number: QTBUG-38873 Change-Id: I6f350106f98cb03a4ff7e1671a84e67f629cedd3 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Fix crash (failing assertion) when declaring a non-string id propertySimon Hausmann2014-05-273-15/+31
| | | | | | | | | | | | | | | | | This isn't very useful QML, but the following was "legal" in 5.1: property int id: id: foo The integer property was not set, but the object's name (id) was still set. With 5.3 this causes a failing assertion, which shouldn't happen. We should do the same thing as the old code in QQmlComponent::buildProperty did for id properties: Set them only if they're of string type. Task-number: QTBUG-38463 Change-Id: I0da58557fbfb0944f53127e0ee77117ac33ce250 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix QQmlScriptString::isEmpty for script strings without source codeSimon Hausmann2014-05-272-1/+52
| | | | | | | | | | The source code is not strictly required anymore and QQmlScriptString should return true with isEmpty() if the object is conceptually empty (not usable), not only when the source code is empty. It can still have a valid binding id and thus be used in QQmlExpression. Change-Id: I777717f2217d0c46e059c382761a1044881c5978 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* deduplicate and decruft SUBDIRS listOswald Buddenhagen2014-05-261-4/+0
| | | | | Change-Id: I56266efbe1623a529c3cf3609254abda443cf940 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix crash when sharing data structures between 32-bit and 64-bitSimon Hausmann2014-05-262-24/+36
| | | | | | | | | | The data structures in QV4::CompiledData are intended to be shareable between different architectures (if endianness is the same). This requires us to pack them, which is possible with MSVC and GCC (which also includes clang) Change-Id: I078254b9d314f60f8973a0c9404f53af41a48fb8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix cached compilation units for file importsSimon Hausmann2014-05-261-0/+2
| | | | | | | | | | If the file doesn't exist in the file system anymore, check if it's at least in the unit cache, as we can still load it from there. This is used for file imports where 'import "someDirectory"' results us in trying to locate someDirectory/<Type>.qml for any instantiation of <Type>. Change-Id: I590161f1d2d133a49ca1b611d9a7e96d52d0bf13 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* V4 JIT: fix usage of d1 on ARM.Erik Verbruggen2014-05-261-1/+0
| | | | | | | | | | The d1 register is used by the JIT as a scratch register, so it is not available for the register allocator. If it would be used for register allocation, the JIT code generation might override it with something else, thereby clobbering the result. Change-Id: Iaf7db873d78e84c28ac9ea341f9d6da76330fe81 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Record synchronous and asynchronous events separately in profiler testUlf Hermann2014-05-221-129/+84
| | | | | | | | | | | | | | | | Render events as well as frame painting and keyboard and mouse interaction happen largely independently of QML engine events. We cannot rely on a specific composite order of both types. The tests are written in a way that allows us to rely on a specific order within each group, though. Pixmap cache events are a special case and need their own category as the load start events are synchronous while all others are asynchronous. Still, there is a defined ordering between them. Task-number: QTBUG-39169 Change-Id: I35220a22dcb08ea0bb7286e27347c287a5ce7983 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Samegame: Add qsqlite as a needed QTPLUGINCaroline Chao2014-05-221-0/+2
| | | | | | | Required plugin are currently not detected automatically (QTBUG-35195). Change-Id: I58e21ff2219ed5ef3042a07d19dbfa914a10f2e5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Mark clip node dirty regardless of how its geometry was changed.Gunnar Sletta2014-05-221-1/+1
| | | | | | Task-number: QTBUG-38473 Change-Id: If6f91f1a82b89de01d254af34128b9aefebaad2d Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Re-enable qquicktextinput test on Mac OS XSimon Hausmann2014-05-211-2/+0
| | | | | | | | Fixed in qtbase with commit 40b195d0f9ee7ef1b917a635bb073fa108b2ed40 Change-Id: I4af6080dde9c6356c11f09a6ded86ce9ce28b6e0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix failing assertion inside MSVC STL in debug buildsSimon Hausmann2014-05-211-2/+2
| | | | | | | | | | | | | | | When using FunctionObject's call() method, we use std::copy to copy the arguments over to the new call context. Unfortunately std::copy has an assertion in there to check that we're not copying out of bounds. What the STL doesn't know is that the Value args[1] array is dynamically allocated and easily expands beyond just one entry. Fall back to copying by hand to work around this issue. Task-number: QTBUG-38195 Change-Id: I6e254b1c893ccf5cad2358179cda1b07b00228e0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix Number.toExponential with parameterSimon Hausmann2014-05-211-1/+1
| | | | | | | | | | The fractionDigits parameter was unfortunately ignored, due to an accidental double variable declaration, the latter in a narrower scope shadowing the former in the correct scope. Task-number: QTBUG-38577 Change-Id: I28f35466d2d744e84b86a3ca6b3371eb86869b55 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Don't crash on AndroidPaul Olav Tvete2014-05-211-1/+7
| | | | | | | | | | | | | If the platform plugin does not support the features needed for QQuickWidget, then don't try to use it. This is a minimal change to stop applications from crashing: it does not give the application a way to find out if QQuickWidget is supported, since that would mean new API, which we can't do in a patch release. Task-number: QTBUG-38268 Change-Id: I975a03b105b1d5c21a1d8ae440a5802ce8c1967b Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Fix copy and paste errorFrederik Gladhorn2014-05-211-1/+3
| | | | | | | | | Fix error 14 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I5f0fa6bd1f14db8e4a86c27610666df6dfd60b1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix copy and paste errorFrederik Gladhorn2014-05-211-1/+1
| | | | | | | | Fix error 10 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I42ba9caa43c2c4925774bdc6aa7942a83cb37ba5 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Focus event fix for QQuickWidgetPaul Olav Tvete2014-05-213-1/+25
| | | | | | | | | | Relay focus in/out events to the offscreen QQuickWindow, and also make the offscreen window believe it has the focus when the render window has it. Task-number: QTBUG-39033 Change-Id: Ib50b134e635833ad3813693ca272f04607c525b8 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Make a pro file based project out of the photoviewer exampleNiels Weber2014-05-2112-67/+175
| | | | | | | | | | | | Having a .pro file project is necessary to be able to deploy to Android. Further patches for Android support will be needed, but this is the base. Task-number: QTBUG-38122 Change-Id: I878ec1df50d7375ae9153f8a34f763b5678d7774 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableIikka Eklund2014-05-2033-796/+1261
|\ | | | | | | Change-Id: I939d6b9d10b3f50d9024b80d7a215b8fd04e8d56
| * Fix QJSEngine::evaluate using the wrong execution contextv5.3.0Simon Hausmann2014-05-092-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In contrary to what the documentation says, QJSEngine in Qt 5.x executes in the context of the global object (QScriptIsolate always called enter on the QV8Engine's "root" context, thus making it current). The v4 implementation unfortunately did what the documentation said and used the current context, which is wrong in many ways. For example it completely breaks the optimization of stack allocated contexts, because when a C++ callback is called from within a JS function with a stack allocated context and that C++ code calls QJSEngine::evaluate and creates new closures, the stack context would become an outter context and cause crashes during GC. This patch restores the behavior of Qt 5.0/5.1 and fixes the documentation. Task-number: QTBUG-38530 Change-Id: Ie6481f02e676954cc94b188a1c87c88e7c56dafa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix crash on host/target word size mismatchesSimon Hausmann2014-05-092-11/+6
| | | | | | | | | | | | | | | | | | | | | | When compiling on a 64-bit host and using the QV4::CompileData on a 32-bit target, the size of QArrayData is different. Therefore we cannot use it in the QV4::CompiledData and have to resort to storing only the characters in there. We can at least still use fromRawData when extracting strings, but the QStringData will have to be allocated now. Change-Id: Ia9dab1722ed72186451b65ba74457051c6ce3155 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Update qmltypes filesAlan Alpert2014-05-066-24/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, fixes some revisioning errors which a manual inspection of the qmltypes files diffs revealed. -mipmapChanged signal is new -windowTitleChanged signal is new -Matrix4x4 made 5.3, but was revisioned for 5.4 Task-number: QTBUG-29806 Change-Id: I4cb8bca6ac6fe8040871734c88aabcd392c1d696 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Android: Fix crash in String.replace() in release buildsv5.3.0-rc1Eskil Abrahamsen Blomfeldt2014-05-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabling optimizations in the compiler, it produces bogus code for the regExp->value deref in the line nMatchOffsets += regExp->value->captureCount() * 2 This is a random refactoring to work around the compiler bug. The only line that actually needs to be touched is the one mentioned above, but I replaced all uses of regExp->value so that it wouldn't look too weird. Task-number: QTBUG-38692 Change-Id: Ib33a523a86ce51ebc6c7095a803fedaebcaa8e63 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * StocQt demo improvementMika Salmela2014-05-0221-719/+850
| | | | | | | | | | | | | | | | | | | | | | Along with general demo improvements, this task implements the new layout to the StocQt demo. Also few bugs on the functionality are corrected, like drawing the stock graph on right way and initial values reset on stock model when changing active stock. Task-number: QTBUG-38254 Change-Id: I9d3387ed0e3f23512b8e60c70246589c10237818 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Always implement text input "canPaste" propertyBernd Weimer2014-05-022-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for TextField control for instance. If QT_NO_CLIPBOARD is defined, canPaste will always return false. Fixes dialogs auto test when QT_NO_CLIPBOARD is defined. [ChangeLog][QtQuick][Platform Specific Changes] Added canPaste property to TextInput element also on platforms that don't support a clipboard (QT_NO_CLIPBOARD is defined). Change-Id: Ia85205672ba59c1fce70852458c514b03d332de6 (cherry picked from commit c2d802049e48d1d6f0bce6eb0972fb26dc4d6ce3) Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
| * Add [ChangeLog] tags to qtdeclarative changelog.Alan Alpert2014-05-021-34/+54
| | | | | | | | | | Change-Id: Ia235b6b2397cfaeb20f0c7ea0d6196c603b2aaaa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix improper antialiasing property behaviorOleg Shparber2014-05-192-3/+12
| | | | | | | | | | | | | | | | | | For components antialiased by default the property was returned as false if default true value was set to true again. Task-number: QTBUG-39047 Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Fix tst_qquicktextedit::cursorRectangle_QTBUG_38947()J-P Nurmi2014-05-192-9/+14
| | | | | | | | | | | | | | | | | | Fix the uninitialize variable and make sure the test creates a window that has a sensible (200x200) size. Change-Id: I02616ab3c832276921e84ae98b7ed926d8fc5f5e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Fix crash with running animators on re-shown windows.Gunnar Sletta2014-05-196-9/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-threaded render loops would clean up the nodes for a window when it was hidden, but the animators kept running and had a reference to the deleted nodes. This was not a problem for the threaded render loop as it would wipe the animator controller as well which would clean the jobs. Fix it by triggering a reset of all nodes in the animators when the window is told to clean up. If an animator is ticked when it doesn't have a node, it will simply do nothing. When the window is made visible again, we call initialize on all animators to find the new node. Task-number: QTBUG-37995 Change-Id: Ie5609d95db29f4b2b30ca5bf641dce901e528389 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | TextEdit: fix cursor rectangle positioningJ-P Nurmi2014-05-163-2/+44
| | | | | | | | | | | | | | | | | | | | | | QQuickTextControl::cursorRectangleChanged() wasn't emitted as appropriate when dragging mouse => The cursor delegate was stuck in wrong position under certain circumstances, especially when selecting multiple lines. Task-number: QTBUG-38947 Change-Id: Ib5b0d2f6ea2a1b3712fbaba4a7ad1865d2b0a74e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* | Accessibility: add focus actionFrederik Gladhorn2014-05-162-0/+27
| | | | | | | | | | | | | | | | | | This at least implements the focus action for items with activeFocusOnTab which works with most controls. VoiceOver for example uses this action. Task-number: QTBUG-38870 Change-Id: I3bdaacec6b07e9baf020499e2e4826e42fe316f0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Doc: Polish property binding explanationsSze Howe Koh2014-05-163-54/+39
| | | | | | | | | | | | | | | | | | - Minor rearrangements - Express things more clearly and/or concisely - Add links Change-Id: If1ed639609e39ed1a2c12aed3971da3ee2c8f8a0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Describe property bindings in terms of relationshipsSze Howe Koh2014-05-166-56/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This patch aims to help readers think about bindings more "declaratively" by introducing a new (albeit very leaky) level of abstraction: Treat bindings as finitary relations, rather than mere JavaScript expressions. - In essence, property bindings are for describing relationships between properties. The fact that the QML engine reactively updates a property's value when its dependencies change, and the fact that arbitrarily complex expressions are valid bindings, are simply implementation details. - Discourage the use of side effects in property bindings. They are not essential for the main purpose of property bindings, they break the finitary relation model, and their use can reduce code readability/maintainability/toolability. - Discourage complex property bindings for similar reasons. Change-Id: I5a0a03bd02768d4c504797a0f86569f3ac066e96 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix typo in Image documentation.Mitch Curtis2014-05-151-1/+1
| | | | | | | | | | Change-Id: Ifa01f3e464c170e5f4739cea4380f1b08eeccc7e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | V4 IR: change BasicBlockSet::const_iterator to use std::find.Erik Verbruggen2014-05-151-20/+12
| | | | | | | | | | | | | | | | | | | | | | When the storage in the BasicBlockSet is a std::vector<bool>, the begin() iterator and the ++operator now use std::find. Good STL implementations have an optimized version specifically for std::vector<bool> that is a lot faster than the iterating that was used before. The change also makes the code more readable. Change-Id: Ic37bac694c133c597b3d61a91b04a0b758516dc3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix regression in QJSValueIterator::next() since Qt 5.1.1Gunnar Sletta2014-05-142-6/+30
| | | | | | | | | | | | | | | | Iteration on the form "while (next) { .. }" would skip the last element. Change-Id: I50692a5a75e23e423e82b7a39e1892f505e4c612 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Doc: add docs for Photo Surface demoLeena Miettinen2014-05-131-4/+126
| | | | | | | | | | Change-Id: Id6f40b1b769fdd103cfb2afda172b1daf9b1a105 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Implement proper support for layoutChange in QQmlDelegateModelDaniel Vrátil2014-05-124-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation is treating model layoutChange the same way as modelReset, which causes problems when using ListView on top of a QSortFilterProxyModel. The model emits layoutChanged whenever a data within sorting column change. Treating it as modelReset leads to poor performance on large models and caused UI issues, because the scrolling position is reset every time. This patch implements proper handling for layoutChanged signals by first handling all items moves and then simulating dataChange for all items. This fixes regression from Qt 5.1 introduced by Change I16b859d9 Task-number: QTBUG-37983 Task-number: QTBUG-34391 Change-Id: I6d3873b7b87e7f0e8fc0c1ed5dc80c6f8fdf6c22 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Doc: Fix invalid cross-referenceKevin Funk2014-05-121-1/+1
| | | | | | | | | | Change-Id: Ib344215f240705100da8d949ac86b57af26a97ef Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | Fix some typos in usage string.Jeff Tranter2014-05-091-2/+2
| | | | | | | | | | | | | | | | Fix some spelling errors in the command usage string. Change-Id: Iee94987d0a3dff78e39f588b4c21415ed40a514c Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Fix tst_textedit.qmlBernd Weimer2014-05-091-9/+38
| | | | | | | | | | | | | | | | | | On platforms that have QT_NO_CLIPBOARD defined copy/paste/cut functions are not available. Change-Id: Ia2c82d0d3910f89642b1c3ef719caee88da3999e Reviewed-by: Damian Jansen <damian.jansen@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Remove V8 profiler serviceUlf Hermann2014-05-096-431/+0
| | | | | | | | | | | | | | | | | | It's broken and useless and it sends confusing data to the profiler client. Task-number: QTCREATORBUG-12188 Change-Id: I944cf19a78ee4378d5773e7aa80876f199a0f03b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | V4 IR: remove unused fields from BasicBlockErik Verbruggen2014-05-091-3/+4
| | | | | | | | | | | | | | Also reserve maximum used size for the in/out edge vectors. Change-Id: I227a2aa0a5211a6425da3aa7318daa120eadfd6c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Re-fix the warning from cached-powers.ccThiago Macieira2014-05-091-0/+6
| | | | | | | | | | | | | | | | | | | | This file is now getting included in a different module. See also e02cb2b31ab0b171f11d278305d9f532f005bc80, 60aed669345be33b916c44556555b922aa3ed928, and 66e72c2cf08c2d2c381c6c22e4760d0df758af52. Change-Id: Ic886bdf823d5dd6d9ae3df64608d8bb9d901661f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Android: Add support for new input method query APIPaul Olav Tvete2014-05-082-3/+12
| | | | | | | | | | | | | | | | | | Change 93fd268d implemented the new API, but missed the final piece that actually made use of it. Task-number: QTBUG-38824 Change-Id: Iea28f2cbb8c6d749d781dcf7437552597977f9ac Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 10:14:01 +0000