summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-212-3/+29
| | | | | Task-number: QT-3957 reviewed-by: Aaron Kennedy
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-201-2/+19
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed font rendering in manually built Qt on ARMv6.
| * Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
| | | | | | | | | | | | | | | | The pixelSize ends up being 0 unless these changes are applied. Must be a compiler bug in GCC 4.3.x, fixed in GCC 4.4.1. Reviewed-by: Prasanth Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-205-20/+166
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't allow posted events to starve native messages. Fix autotest failure with experimental client deco fix a translation bug in qt_zh_CN.ts Add skeleton changes file for Qt 4.7.2
| * | Don't allow posted events to starve native messages.Bradley T. Hughes2010-10-201-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9215506e6a057d8aef7415c2921214e1ba1c760d, which caused the above behavior. The intention of this commit was to prevent native messages from starving posted events, but as shown by the example, it is possible for posted events to then starve native messages (which results in very bad behavior on Windows if the user is moving or resizing a window). Unfortunately, my attempts to construct an autotest for this have failed, as I've not found a way to generate the right kinds of native messages from code. Task-number: QTBUG-14021 Reviewed-by: prasanth
| * | Fix autotest failure with experimental client decoHarald Fernengel2010-10-202-3/+5
| | | | | | | | | | | | The menu bar is in the outer layout, not the inner one
| * | fix a translation bug in qt_zh_CN.tsliang jian2010-10-201-1/+1
| | | | | | | | | | | | | | | Merge-request: 858 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-201-0/+158
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add skeleton changes file for Qt 4.7.2
| | * Add skeleton changes file for Qt 4.7.2Jason McDonald2010-10-201-0/+158
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-203-51/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure we don't refill the view before all model changes are complete. ListView item insertion didn't handle delayed item removal correctly.
| * | | Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setPosition(0) in itemsRemoved caused the view to be refilled, which is a bad thing if the model has changed but not all updates have been handled. Fixed in both ListView and GridView. Task-number: QTBUG-14548 Reviewed-by: Michael Brasser
| * | | ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-202-30/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The delayed removal items weren't handled correctly by mapRangeFromModel() function. Use mapFromModel() instead which gives us what we actually want and remove unused mapRangeFromModel(). Task-number: QTBUG-14471 Reviewed-by: Michael Brasser
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-206-41/+40
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.
| * | | Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-206-41/+40
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | GL_OES_element_index_uint detection was not working because EGL config wasn't yet resolved. In addition QFrameBufferObject should use 24bit depth render buffer if extension is available. Task-number: QTBUG-14542 Reviewed-by: Gunnar
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-205-8/+50
|\ \ \ | |/ / |/| / | |/ | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix conflict between QDeclarativeGraphics_DerivedObject declared both in qdeclarativeglobal and tst_creation.cpp Fix position of synthesized semicolon tokens.
| * Fix conflict between QDeclarativeGraphics_DerivedObject declared both in ↵Joona Petrell2010-10-201-2/+2
| | | | | | | | | | | | | | qdeclarativeglobal and tst_creation.cpp Task-number: Reviewed-by: Martin Jones
| * Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-204-6/+48
| | | | | | | | | | Authored-by: Roberto Raggi Reviewed-by: Aaron Kennedy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-206-7/+21
|\ \ | |/ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Further focus scope fixes. Fix visual test. Fix recording of visual tests.
| * Further focus scope fixes.Michael Brasser2010-10-193-7/+19
| | | | | | | | | | | | Follow-up to e11ee40cefc981fbdcfb10816039d4efb080fb17. Reviewed-by: Yoann Lopes
| * Fix visual test.Michael Brasser2010-10-192-0/+0
| |
| * Fix recording of visual tests.Michael Brasser2010-10-191-0/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1975-4020/+3515
|\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Tic-tac-toe: Fix z-order of status text. Don't export QtDeclarative symbols needed by QtCreator on Symbian Properties take precedence over methods Call the correct vme meta object when connecting alias signals Fix Twitter demo's list view for devices Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1975-4020/+3515
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Tic-tac-toe: Fix z-order of status text. Don't export QtDeclarative symbols needed by QtCreator on Symbian Properties take precedence over methods Call the correct vme meta object when connecting alias signals Fix Twitter demo's list view for devices Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| | * Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
| | | | | | | | | | | | Reviewed-By: Bea Lam
| | * Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1933-2658/+2697
| | | | | | | | | | | | | | | Task-number: QTBUG-14041 Reviewed-by: Aaron Kennedy
| | * Properties take precedence over methodsAaron Kennedy2010-10-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Properties have always had precedence over methods in C++ classes, but erroneously, not in types declared in QML. This was because the property cache for the two went through a different code path. With changes 0c06e59577df1ec715e67d6d5842800bcec24945 and c407d79f79c67f2f2bb84efc93061fd57fe4cf54 the code paths were unified and this bug was exposed.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-10-191-1/+1
| | |\
| | | * Fix Twitter demo's list view for devicesJoona Petrell2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of ListView in Twitter demo was fixed, which looked bad when the demo was run maximized or in a full screen mode on devices. Task-number: Reviewed-by: Aaron Kennedy
| | * | Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-194-7/+52
| | |/ | | | | | | | | | Task-number: QTCREATORBUG-2769
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1934-1332/+741
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| | | * Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | | | | | | | | | | | | | | | Task-number: QT-4158
| | | * Fix visual tests.Michael Brasser2010-10-1829-1289/+685
| | | |
| | | * ListView.visibleArea.heightRatio should not emit a signal when it does not ↵Yann Bodson2010-10-183-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change. Task-number: QTBUG-14492 Reviewed-by: Michael Brasser
| | | * Properties should have precedence over methods.Michael Brasser2010-10-181-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced by recent changes to the property cache. Task-Number: QTBUG-14500 Reviewed-by: Aaron Kennedy
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-192-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Only add ICON for application projects in symbianpkgrules.pri
| * | | Only add ICON for application projects in symbianpkgrules.priMiikka Heikkinen2010-10-192-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Build break is caused on some environments if ICON is defined for non-application projects, as application_icon.prf doesn't get processed for those, resulting in empty TARGETFILE field in bld.inf. Task-number: QT-4193 Reviewed-by: Janne Koskinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-192-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix partial upgrade package UID for libinfixed Qt Fixed recursive sis file generation. Readded DESTDIR that was removed by mistake in a3c755e358596.
| * | | Fix partial upgrade package UID for libinfixed QtMiikka Heikkinen2010-10-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libinfixed Qt has different UID than regular Qt, so partial upgrades of individual Qt libraries didn't work right when the UID was hardcoded to regular Qt UID. Reviewed-by: Janne Anttila
| * | | Fixed recursive sis file generation.axis2010-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It broke for s60main after the partial upgrade targets were moved to qbase.pri. RevBy: Trust me
| * | | Readded DESTDIR that was removed by mistake in a3c755e358596.axis2010-10-191-0/+2
| |/ / | | | | | | | | | RevBy: Trust me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-191-8/+30
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash on exit.
| * | Fix crash on exit.Aaron McCarthy2010-10-191-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | If QNetworkConfigurationManager is deleted from the QApplication destructor it will be deleted after QNetworkConfigurationManagerPrivate global static (which is also deleted by QApplication). Fixed by testing if connManager() returns 0 before use. Task-number: QTBUG-14447
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-182-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Prepend epocroot to extra target tools if they start with /epoc32/ QS60Style: ComboBox disappears after orientation switch
| * | | Prepend epocroot to extra target tools if they start with /epoc32/Miikka Heikkinen2010-10-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to define extra targets and extra compilers commands that use tools under EPOCROOT without having to worry whether EPOCROOT contains drive letter or not, which is demanded by sbsv2 toolchain. For example, if command to be used is "%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted in .pro file and the command be given simply as "/epoc32/tools/foobar.exe". Reviewed-by: Janne Koskinen
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-181-1/+64
| |\ \ \
| * | | | QS60Style: ComboBox disappears after orientation switchSami Merila2010-10-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to that QS60Style uses desktop area for a bounding rect of combobox content to disallow it to grow outside of screen size. Unfortunately with some recent changes to screensize handling in desktop widget size makes the desktop resize to happen later than when style is asked for combobox size. So, style returns invalid QSize for combobox content size. As a fix, if the returned size is invalid, ask it directly from QCommonStyle. Task-number: QTBUG-14423 Reviewed-by: Janne Anttila
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-188-17/+163
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: In meego graphics system remove a redundant check. Use the real screen size in meegographics surface scaling, not hardcoded one. Removing glFinish calls in eglSharedImage code. Not needed anymore. ::copy on the QMeeGoPixmapData creates a raster-backed pixmap. Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriate
| * | | | In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Use the real screen size in meegographics surface scaling, not hardcoded one.Michael Dominic K2010-10-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (was a driver bug after all). Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v0.12 at 2025-08-18 18:32:54 (GMT)