summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Adding note about QDrag::exec()Morten Engvoldsen2010-05-311-1/+3
| | | | | | Adding note to the QDrag::exec docs alerting the user about Windows speciffic behaviour. Task-number: QT-640
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-314-1/+11
|\
| * Fix compilation with stricts compilers.Olivier Goffart2010-05-311-1/+1
| | | | | | | | | | | | Base class is type-dependent. One must not use unqualified-id to access base member. Reveiwed-by: Roberto Raggi
| * Fix QT_NO_DIRMODEL build error in QtDeclarative.Tasuku Suzuki2010-05-313-0/+10
| | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> Merge-request: 652 Merge-request: 652 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Doc: replacing old imageMorten Engvoldsen2010-05-311-0/+0
|/ | | | Task-number: QT-1520
* Revert "Added native key support to QSharedMemory API."Andreas Aardal Hanssen2010-05-317-123/+65
| | | | This reverts commit 9b4ff3deb28b3d642dc4480207f2f23841cf26e9.
* Revert "Improved documentation for QSharedMemory's key/setKey functions."Andreas Aardal Hanssen2010-05-311-37/+27
| | | | This reverts commit 26f3dbf0e20dbaf131bbbb35440b1ecb40b3f405.
* Fix a simple mistake in QXmlStreamReader::atEnd() docs.Robin Burchell2010-05-311-1/+1
| | | | | Merge-request: 655 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Improved documentation for QSharedMemory's key/setKey functions.Andreas Aardal Hanssen2010-05-311-27/+37
|
* Added native key support to QSharedMemory API.Mirko Damiani2010-05-317-65/+123
| | | | | | | | | | | | | | | | | | | | Methods setNativeKey() and nativeKey() were added to QSharedMemory API. Shared memory's native key is returned by nativeKey() and it is set with either setKey() or setNativeKey(). setKey() leads to a native key that is platform independent while setNativeKey() directly sets the native key without any mangling. When using setNativeKey(), key() returns a null string and shared memory's system semaphore is not set. This means that is up to the user to define a such protection mechanism (i.e. lock() can't be used on native keys). QSharedMemory tests were updated. Merge-request: 1497 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-311-4/+4
| | | | | | | | Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the binary and sources are in the same directory. The fix reverts the code back to how it was in 4.5 (where it still works with shadow builds). Reviewed-by: Denis Dzyubenko
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-287-13/+156
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug where testlib would not respect the -iterations option. Improve precision of testlib benchmarking. QMetaMethod::invoke: Document that the function does not check the arguments add test for QMetaMethod::invoke Make QGLBuffer copiable
| * Fixed bug where testlib would not respect the -iterations option.Samuel Rødal2010-05-281-1/+1
| | | | | | | | Reviewed-by: Morten Sørvig
| * Improve precision of testlib benchmarking.Samuel Rødal2010-05-282-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 20 ms is a bit too to get a precise measurement due to limited timer resolution. We increase the limit to 50 ms and introduce a warm-up iteration to prevent any state or cache-related issues which can be hard to account for in the tests. On the N900 this seems to decrease the variance of test results by 30 %, and fixes some cases where the results were way off due to hidden state. Task-number: QT-3390 Reviewed-by: Morten Sørvig
| * QMetaMethod::invoke: Document that the function does not check the argumentsOlivier Goffart2010-05-281-0/+7
| | | | | | | | | | | | And added an assert to ease debugging Task-number: QTBUG-10945
| * add test for QMetaMethod::invokeOlivier Goffart2010-05-281-0/+51
| |
| * Make QGLBuffer copiableRhys Weatherley2010-05-282-11/+90
| | | | | | | | Reviewed-by: Gunnar
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-285-320/+167
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Fixed the model/view programming page; tried a style change. fix visibility detection for g++ with a qualified binary name
| * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-2847-327/+566
| |\ \
| | * | fix visibility detection for g++ with a qualified binary nameOswald Buddenhagen2010-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it may be called g++-4.4 (versioned) or x86_64-pc-linux-gnu-g++ (cross-compiler), so make the pattern just match anything with g++. it may also be aliased to "c++", so catch that as well. otoh, "gcc" would be a poor choice for QMAKE_CXX, so don't recognize that. Reviewed-by: thiago Task-number: QTBUG-11065
| * | | qdoc: Fixed the model/view programming page; tried a style change.Martin Smith2010-05-284-319/+166
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2811-48/+85
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Active window focus gain should not open virtual keypad Use QElapsedTimer rather than QTime::elapsed()
| * | | Active window focus gain should not open virtual keypadJoona Petrell2010-05-285-6/+27
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-28209-1644/+2959
| |\ \ \
| * | | | Use QElapsedTimer rather than QTime::elapsed()Martin Jones2010-05-286-42/+58
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-288-102/+146
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-278-102/+146
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong QGraphicsItem::childrenBoundingRect() when applying effects. Fix a bug in QDirectFBPixmapData::fromImage Replace memmove with memcpy Fixed compilation of QtOpenGL. Optimize initialization of QStaticText
| | * | | | Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-272-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we used the children's raw bounding rect instead of using their effective bounding rect when calculating the bounds. Auto test included. Task-number: QTBUG-10756
| | * | | | Fix a bug in QDirectFBPixmapData::fromImageAnders Bakken2010-05-272-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every image that was converted with flags & Qt::NoOpaqueDetection would be considered to have an alpha channel. This patch fixes that and simplifies the code a little. Merge-request: 637 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| | * | | | Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qMemCopy is faster than memmove, and there's no chance of overlapping source and destination memory in these cases. Reviewed-by: Samuel
| | * | | | Fixed compilation of QtOpenGL.Samuel Rødal2010-05-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | * | | | Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-272-81/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QStaticText would be created once and used often, not much thought was put into optimizing its initialization. For simplicity, the code would do two drawText() passes. Since this was an unnecessary overhead, the extra pass has been removed and replaced by memmoves instead. Initialization is now twice as fast. Reviewed-by: Samuel
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2810-83/+103
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix escaping - by not using eval escape backslashes in QMAKE_PRL_LIBS fix & unify path separator escaping Removed unused variable Upgrade harfbuzz to the latest version
| * | | | | fix escaping - by not using evalOswald Buddenhagen2010-05-273-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the left-hand-side of qmake assignments is expanded, so there is no need to use eval.
| * | | | | escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they may contain (absolute) windows paths, which need escaping now. Reviewed-by: mauricek
| * | | | | fix & unify path separator escapingOswald Buddenhagen2010-05-273-49/+58
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| * | | | | Removed unused variableThorbjørn Lindeijer2010-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | | | | Upgrade harfbuzz to the latest versionLars Knoll2010-05-272-13/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the folling changes from harfbuzz: commit 85ad0ddd092522b4cff251f324128662f100991f Author: Lars Knoll <lars.knoll@nokia.com> Date: Thu May 27 16:05:00 2010 +0200 use unsigned char instead of unsigned in the bitfield. This saves significant memory, as the HB_CharAttributes and HB_GlyphAttributes structures are not 4 byte aligned anymore, by aligned to 1 resp. 2 bytes. The change is not compliant with ISO C, but accepted by almost all compilers. commit 30f0e6c3d0aa67ab9ff95c60903fe28c4df80fbc Author: Behdad Esfahbod <behdad@behdad.org> Date: Mon May 17 15:43:46 2010 -0400 [hangul] Fix typo Reviewed-By: Thiago Macieira
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2710-188/+130
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Tweak aesthetics of QML viewer inside QtDemo Add key event handling to the declarative web view Improve gradient docs
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-27209-1531/+2875
| |\ \ \ \
| * | | | | Tweak aesthetics of QML viewer inside QtDemoAlan Alpert2010-05-278-175/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the UX more controlled from QML, and tweak the frame to be better. Blur mechanism has been reworked, but still disabled by default.
| * | | | | Add key event handling to the declarative web viewAlan Alpert2010-05-261-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very simple approach, I don't know if a more nuanced system would be appropriate. Task-number: QTBUG-11025
| * | | | | Improve gradient docsAlan Alpert2010-05-261-0/+4
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-277-7/+52
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove superfluous forward declaration. Update documentation for the -font command line option Fixed a crash when creating QGtkStyle before QApplication Added support for Indonesian language on Symbian. Ensure that activation object has been created before popping scope of native context
| * | | | | Remove superfluous forward declaration.kh12010-05-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11049 Reviewed-by: ck
| * | | | | Update documentation for the -font command line optionBradley T. Hughes2010-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is ignored when Qt is built with fontconfig support, make sure it is documented. Task-number: QTBUG-3671
| * | | | | Fixed a crash when creating QGtkStyle before QApplicationJens Bache-Wiig2010-05-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10758 Reviewed-by: ogoffart
| * | | | | Added support for Indonesian language on Symbian.Denis Dzyubenko2010-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have support for ELangIndonesian, but we also need to support new ELangIndonesian_Apac which has appeared in Symbian^3. Task-number: QT-3369 Reviewed-by: trustme
| * | | | | Ensure that activation object has been created before popping scope of ↵Kent Hansen2010-05-272-0/+46
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native context One shouldn't have to call activationObject() or scopeChain() before calling popScope(); the scope chain should always have 2 items (activation and global object) before we start popping anything from the internal chain. Task-number: QTBUG-11020 Reviewed-by: Olivier Goffart
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2720-89/+321
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve QML framerate debugging If a pathview delegate changes size, reposition center on path Remove deprecated Flickable::overshoot property. Don't display unnecessary copyright headers in doc