summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Rhys Weatherley2009-08-2435-89/+89
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Update changes doc.Michael Brasser2009-08-241-2/+2
| |
| * fromState -> from, toState -> to for Transition.Michael Brasser2009-08-2434-87/+87
| |
* | Remove the overhead of string conversion from the vector() built-inRhys Weatherley2009-08-241-4/+2
|/ | | | Reviewed-by: Aaron Kennedy
* Fix qmldom test casesKai Koehne2009-08-211-33/+44
|
* Store location information for "Type XXX is not available" messagesKai Koehne2009-08-215-25/+61
| | | | | QmlScriptParser now also stores the locations where a specific type was referenced.
* Doc fix (Rect->Rectangle)Kai Koehne2009-08-211-2/+2
|
* updateWarwick Allison2009-08-213-2/+4
|
* rename to .qml so people update themWarwick Allison2009-08-2165-71/+71
|
* RectangleWarwick Allison2009-08-211-1/+1
|
* update error messagesWarwick Allison2009-08-211-2/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-21260-3145/+6347
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * SetPropertyAction -> PropertyActionMartin Jones2009-08-2113-76/+77
| |
| * Renamed transition action elementsMartin Jones2009-08-2112-99/+96
| | | | | | | | | | RunScriptAction -> ScriptAction ParentChangeAction -> ParentAction
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2111-0/+130
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Rhys Weatherley2009-08-215-9/+68
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Add vector() function as a built-in to QMLRhys Weatherley2009-08-212-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier and more declarative to specify rotation axes: axis: vector(0, 1, 0) instead of: axis.x: 0; axis.y: 1; axis.z: 0 Reviewed-by: Martin Jones
| | * | Make QVector3D a first-class builtin type within QMLRhys Weatherley2009-08-219-0/+88
| | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| * | | Rename State change elements.Martin Jones2009-08-2162-369/+367
| | |/ | |/| | | | | | | | | | | | | SetProperties -> PropertyChanges RunScript -> StateChangeScript SetAnchors -> AnchorChanges
| * | Add MouseRegion::pressedButtons property. Update mouseX/Y when hovered.Martin Jones2009-08-215-9/+68
| |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-08-2110-183/+702
| |\ | | | | | | | | | kinetic-declarativeui
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-08-202-8/+15
| | |\
| | | * Force rasterfallbacks with a env variable in dfbAnders Bakken2009-08-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If qgetenv("QT_DIRECTFB_FORCE_RASTER").toInt() > 0 all paint operations will fall back to the raster engine in DirectFB. Good trick for debugging. I hijacked the compositionModeStatus variable for this since it's checked for every paint operation anyway and I didn't want to introduce any overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * Support RGB32 in DirectFB againAnders Bakken2009-08-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I make sure all surfaces that Qt may paint on are ARGB instead of RGB32 the problem that was solved by cef63710576571405b4eed7b225e6c895a633d6a is still solved. Reviewed-by: Donald <qt-info@nokia.com>
| | * | Merge branch 'kinetic-transform' of git@scm.dev.nokia.troll.no:qt/kineticRhys Weatherley2009-08-208-175/+687
| | |\ \ | | | |/ | | |/|
| | | * Fix sub-attaq after the QGraphicsTransform changesRhys Weatherley2009-08-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Benchmarks comparing QMatrix4x4 with QTransformRhys Weatherley2009-08-201-0/+411
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Remove QGraphicsTransform::project()Rhys Weatherley2009-08-194-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | QMatrix4x4::toTransform() now does what project() used to do. Reviewed-by: trustme
| | | * Add projection support to QMatrix4x4::toTransform()Rhys Weatherley2009-08-192-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting from 3D back to 2D, it is necessary to project the z component unless an orthographic projection is desired. This change adds a distanceToPlane argument that specifies the perspective projection factor to apply during the conversion. The default value of 1024 corresponds to the projection performed by QTransform::rotate(), for consistency with existing classes. Reviewed-by: trustme
| | | * Fix comment for QGraphicsTransform::project()Rhys Weatherley2009-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Minor error in the documentation for the projection matrix. Reviewed-by: trustme
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-transformRhys Weatherley2009-08-192-0/+10
| | | |\
| | | * | Re-implement QGraphicsTransform to use QMatrix4x4Rhys Weatherley2009-08-194-165/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTransform-based transformations create problems when performing X and Y axis rotations because they aren't using true 3D. This change modifies QGraphicsTransform and its sub-classes to use QMatrix4x4 as the standard transformation matrix, with a project() function to project back to 2D when required. Reviewed-by: trustme
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-216-27/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | update QmlChanges.txtYann Bodson2009-08-211-1/+1
| | | | | |
| | * | | | Renaming: Bind -> BindingYann Bodson2009-08-215-26/+26
| | | | | |
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-08-20165-2382/+4880
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / kinetic-declarativeui
| | * | | Add value_type definition for STL compatibility.David Faure2009-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes compilation of std::back_inserter(myQByteArray) when compiling with "-std=c++0x -pedantic". Some code (ifdef'ed with CXX0X) in stl_iterator.h uses value_type. Can't hurt to define it, even if the code is marked experimental. gcc 4.3.3, libstdc++6-4.3. Merge-request: 1286 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | Respect SmoothPixmapTransform in dfbpeAnders Bakken2009-08-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the renderHint SmoothPixmapTransform is set and a drawPixmap/drawTiledPixmap/fillRect(QBrush(QPixmap)) includes a scale we should fall back to raster engine. Reviewed-by: Donald <qt-info@nokia.com>
| | * | | Fix undo/redo of single-command edit blocksmae2009-08-202-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (with QTextCursor::beginEditBlock() and QTextCursor::endEditBlock()) Previously QTextDocument would treat single command blocks as if there was no block, i.e. command compression would occur, causing tst_QTextDocument::testUndoBlocks() to fail. The patch completes the insufficient block-flag of QTextUndoCommand with an addition flag block_end. The block-flag itself is renamed to block_part. Reviewed-by: con
| | * | | Extend testUndoBlock() with a single command block insertmae2009-08-201-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test a newly discovered bug when a beginEditBlock()/endEditoBlock() contains only one single insertion command. It should still be treated as an undo block of its own.
| | * | | split the qstringbuilder autotest into fourhjk2009-08-2015-43/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Some S60 and WinCE test scripts prefer to have only one executable per directory.
| | * | | QNAM HTTP: New attribute, Demo browser: Some request statistic outputMarkus Goetz2009-08-208-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New output that tells if a QNetworkReply was retrieved by using HTTP pipelining. The demo browser now shows some (debug) output about usage of cache, pipelining and SSL. Reviewed-by: Prasanth
| | * | | This variable is used to signal a thread to exit. It should be volatile.Thiago Macieira2009-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a long stretch, but it could happen that the compiler optimises out the checking of the variable because it could not change synchronously. In any case, it's best to set it to volatile to ensure that all architectures reload properly (memory ordering semantics) Reviewed-by: Alexis Menard
| | * | | Autotest: this test is not passing: so show that.Thiago Macieira2009-08-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that this the test is running into a false positive. It thinks it's ok, but it isn't. So show the problem.
| | * | | Autotest: remove unreliable test.Thiago Macieira2009-08-201-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test required Qt to be built in debug mode. But there's no way of checking that from the autotest: some of our test machines build Qt in release mode but the tests in debug mode. So we don't test the Q_ASSERT.
| | * | | Cocoa: cannot quit applicationRichard Moe Gustavsen2009-08-201-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Qt is used from within a native cocoa application. This patch allowes the application to terminate if we have no current event loops running. This should be safe in itself, and also handle the case where NSApp run is called from outside Qt. Task-number: 259928 Reviewed-by: msorvig
| | * | | Improved support for SVG animation.Kim Motoyoshi Kalland2009-08-204-93/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for from-by-animation and by-animation in the animateTransform element. Updated bubbles.svg in the svgviewer example to make it work like intended with the corrected animation code. Task-number: Partially fixes 254784 Reviewed-by: Trond
| | * | | Fixed crash in QtSvg caused by division by zero in animation code.Kim Motoyoshi Kalland2009-08-201-4/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | * | | Fix for SVG animate-transform when additive = "replace".Suneel BS2009-08-203-19/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On animate transform if additive = "replace" then transform specified with the element should be replaced with value of animateTransform. If additive = "sum" , then apply the animateTransform on top of element level transform. Reviewed-by: Kim
| | * | | Changed QSvgPaintEngine::drawImage() to ignore aspect ratio.Kim Motoyoshi Kalland2009-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling drawImage(), you expect the entire target rectangle to be filled, but an SVG user agent preserves the source image's aspect ratio by default. This fix explicitly turns off preservation of aspect ratio. Task-number: 257052 Reviewed-by: Trond