summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-217-11/+15
|\
| * Only ignore the same target value for a Behavior when it is running.Michael Brasser2010-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Otherwise a Behavior may mistakenly not be triggered. This situation can arise when the property in question has been manipulated via the property system, followed by a direct function call (which correctly bypasses the Behavior), followed by a another change via the property system. Task-number: QTBUG-12295
| * font.letterSpacing used percentage rather than absolute values.Martin Jones2010-07-215-8/+8
| | | | | | | | | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison
| * Rewinding AnchorChanges should not make target item's implicit width and ↵Joona Petrell2010-07-211-2/+6
| | | | | | | | | | | | | | height explicit Task-number: QTBUG-12273 Reviewed-by: Michael Brasser
* | Ensure redirects (and indeed all reply process) is done in the right thread.Warwick Allison2010-07-211-23/+32
|/ | | | | | | i.e. the thread with the QNAM the original reply was created in. Task-number: QTBUG-12302 Reviewed-by: Aaron Kennedy
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2012-190/+253
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile: include <float.h> for usage of FLT_MAX. Restore the FLT_MAX define. Make Item::transformOriginPoint read-only Ensure the boundingRect() of Text is correctly calculated. Better defaults for MouseArea's drag. various doc improvements for animation elements fixes for dynamic object creation docs Change docs to show how to define enum properties Improve documentation on setting arbitray transform origin points Ensure released VisualItemModel items are removed from the scene. Improve QML text rendering when LCD smoothing is enabled for OS X.
| * Compile: include <float.h> for usage of FLT_MAX.Michael Brasser2010-07-202-8/+2
| |
| * Restore the FLT_MAX define.Martin Jones2010-07-202-0/+8
| | | | | | | | Seems some platforms don't have it.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2012-190/+251
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make Item::transformOriginPoint read-only Ensure the boundingRect() of Text is correctly calculated. Better defaults for MouseArea's drag. various doc improvements for animation elements fixes for dynamic object creation docs Change docs to show how to define enum properties Improve documentation on setting arbitray transform origin points Ensure released VisualItemModel items are removed from the scene. Improve QML text rendering when LCD smoothing is enabled for OS X.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-209-187/+206
| | |\
| | | * Ensure the boundingRect() of Text is correctly calculated.Michael Brasser2010-07-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to create our cached image in boundingRect() if it doesn't already exist, to prevents painting errors. Reviewed-by: Warwick Allison
| | | * Better defaults for MouseArea's drag.Michael Brasser2010-07-202-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow essentially unbounded dragging once drag.target is set. The previous default of contraining the dragging to 0,0 (i.e. no drag) was unintuitive for learners. It's rare that unbounded is actually what you want, but it makes it much easier to get started with the element. Task-number: QTBUG-11184 Reviewed-by: Martin Jones
| | | * various doc improvements for animation elementsBea Lam2010-07-206-182/+201
| | | |
| | * | Make Item::transformOriginPoint read-onlyMartin Jones2010-07-201-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Using this property on Item will break transformOrigin property. We have never documented it. It should not have been used. Now it is enforced as best we can. Task-number: QTBUG-12265 Reviewed-by: Aaron Kennedy
| | * Improve documentation on setting arbitray transform origin pointsMartin Jones2010-07-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | transformOriginPoint is undocumented for a reason. It shouldn't be used by Item. Added some docs to assist find the right way, i.e. Scale and Rotation elements. Task-number: QTBUG-12265
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-206-776/+49
| | |\
| | | * Improve QML text rendering when LCD smoothing is enabled for OS X.Michael Brasser2010-07-192-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text in QML is always painted into a pixmap, and with sub-pixel antialiasing enabled this produced incorrect results. This patch is a temporary fix until QTBUG-12252 and/or QTBUG-7747 can be properly addressed in a patch release. In the worst case, if using QML and QPainters are being constructed in a non-GUI thread, this patch could potentially turn off sub-pixel antialiasing for them. Task-number: QTBUG-11002 Reviewed-by: Aaron Kennedy Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * | Ensure released VisualItemModel items are removed from the scene.Martin Jones2010-07-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Also parent them back to the VIM to ensure correct destruction. Task-number: QTBUG-12261
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-201-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed some translations doc: Fixed typos in QAbstractFileEngineIterator Updated changelog for 4.7.
| * | | doc: Fixed typos in QAbstractFileEngineIteratorRobert Loehning2010-07-201-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-201-6/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added missing deployment to autotest. Fixed some deployment issues on Symbian. Fixed a QSplashScreen hanging bug in S60 3.1 devices.
| * | | Fixed a QSplashScreen hanging bug in S60 3.1 devices.axis2010-07-201-6/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSymbianBitmapDataAccess is used to provide access to the bitmap heap in a manner that locks correctly on all platform versions. The heapWasLocked variable was meant to protect against the case where the heap is locked recursively. However, it failed to take into account the case where the same QSymbianBitmapDataAccess object was used to lock recursively. In this case the variable would be changed to true on the second lock, which means that the lock would never be released again. This was fixed by making the access reference counted instead. Since the bitmap heap lock is global, the refcount was made global as well. Task: QTBUG-11129 RevBy: Jason Barron AutoTest: Works again. It was hanging before this fix.
* | | Fix a Headerview layout bugPierre Rossi2010-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When the sections were moved calling logicalIndex on what was already a logical index messed up the hidden sections. Task-number: QTBUG-12268 Reviewed-by: Gabriel
* | | Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-201-2/+2
|/ / | | | | | | | | | | | | | | The problem was that the QT_BEGIN_NAMESPACE was in the wrong place. I moved it 10 lines before and the problem is gone. Task-number: QTBUG-12262 Reviewed-by: Prasanth
* | Extend the detection of CPU feature for x86Benjamin Poulain2010-07-192-1/+17
| | | | | | | | | | | | Add detection of CPU extension for SSE3, SSSE3, SSE4.1, SSE4.2 and AVX. Reviewed-by: Andreas Kling
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-198-6/+18
|\ \ | |/
| * Fix ListView sections with QList<QObject*>Martin Jones2010-07-192-1/+6
| | | | | | | | | | | | | | QDeclarativeVisualDataModel::stringValue() did not handle QList<QObject*> model types. Task-number: QTBUG-12005
| * Doc error fixes.Martin Jones2010-07-194-4/+4
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-198-22/+45
| |\
| * | PathView doc clarification.Martin Jones2010-07-192-1/+8
| | |
* | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
| |/ |/| | | | | | | Task-number: QT-3584 Reviewed-by: Trustme
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-191-2/+2
|\ \ | |/ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105 Always place PathView delegates centered on the path Add a PathView example.
| * Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105Martin Jones2010-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | Always place PathView delegates centered on the path The scale of the delegate was used to offset the item. This was a bad way of making the item appear to be positioned correctly when the default transform origin was the top-left. Now that transform origin is center, it is obvious that it was a bad idea. Task-number: QTBUG-12245 Reviewed-by: Michael Brasser
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-181-5/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2 Used aligned load and store when possible for the blending of ARGB32
| * | Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2Andreas Kling2010-07-181-4/+4
| | | | | | | | | | | | | | | The unaligned prologue was processed without using the const alpha. Regressed with 9427b4c8f3b5.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-181-5/+28
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Used aligned load and store when possible for the blending of ARGB32
| | * Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-171-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unaligned load and store can be costly. This patch mitigate the problem by aligning the destination before using SSE2. The destination is aligned because it is used by load and store, while the source is only use by load. On Atom, the blending test is 7% faster for ARGB32. Re-pushing that patch, thanks to awesome policies... Reviewed-by: Andreas Kling
* | | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-187-17/+17
|/ / | | | | | | | | | | | | | | This is (supposedly) more efficient as the compiler can optimise it to a builtin, per Thiago. Merge-request: 2430 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
* | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-1798-552/+3755
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-171-0/+12
| |\ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-171-0/+12
| | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
| | | * QDeclarativeDebugTrace: Do not send message if the client did not enabled ↵Olivier Goffart2010-07-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CanvasFrameRate This silents a lot of warnings in creator. Reviewed-by: Aaron Kennedy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-175-11/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Used aligned load and store when possible for the blending of ARGB32" Used aligned load and store when possible for the blending of ARGB32 Windows mobile: hide [X] button in task bar on unmaximize Windows mobile: the [X] button in the taskbar minimizes the widget Windows mobile: show the [X] button in the taskbar when maximizing unused struct DIBINFO removed from qguifunctions_wince.cpp Fixes the Oracle invalid date bug when date is greater or equal to 2800
| | * | | Revert "Used aligned load and store when possible for the blending of ARGB32"Jason McDonald2010-07-171-29/+5
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c11c0a8f2a99cb3734a24d9d6c43977807471d7, which breaks compilation on some platforms.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-176-16/+52
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Used aligned load and store when possible for the blending of ARGB32 Windows mobile: hide [X] button in task bar on unmaximize Windows mobile: the [X] button in the taskbar minimizes the widget Windows mobile: show the [X] button in the taskbar when maximizing unused struct DIBINFO removed from qguifunctions_wince.cpp Fixes the Oracle invalid date bug when date is greater or equal to 2800
| | | * | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-161-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unaligned load and store can be costly. This patch mitigate the problem by aligning the destination before using SSE2. The destination is aligned because it is used by load and store, while the source is only use by load. On Atom, the blending test is 7% faster for ARGB32. Reviewed-by: Andreas Kling
| | | * | | Windows mobile: hide [X] button in task bar on unmaximizeJoerg Bornemann2010-07-163-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling showNormal on a window that was maximized, we must remove the [X] button from the task bar. But only if it was added by qt_wince_maximize. Task-number: QTBUG-8408 Reviewed-by: Martin Petersson
| | | * | | Windows mobile: the [X] button in the taskbar minimizes the widgetJoerg Bornemann2010-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [X] or cancel button in the task bar shall just "minimize" the widget on Windows mobile. A press on this button results in a WM_COMMAND, IDCANCEL message. Before this patch we just sent a QCloseEvent to the widget, which had basically no effect. Now, we're calling showMinimzed(), which is the desired behaviour. Task-number: QTBUG-8408 Reviewed-by: Martin Petersson
| | | * | | Windows mobile: show the [X] button in the taskbar when maximizingJoerg Bornemann2010-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're now showing the cancel button explicitly in the taskbar on maximize, if the widget does not have the widget flags CancelButtonHint and OKButtonHint. Task-number: QTBUG-8408 Reviewed-by: Martin Petersson
| | | * | | unused struct DIBINFO removed from qguifunctions_wince.cppJoerg Bornemann2010-07-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Petersson