summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed some problems in qtconfig's PreviewWidgetBoris Moiseev2010-10-063-33/+28
| | | | | | | | | | One problem was introduced by the convertion of widget from Qt3: there is no such field as "text" in QTextEdit. Also, widget now is not direct ancestor of UI file. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Removed the inheritance from ui file in qtconfig's PaletteEditorAdvancedBoris Moiseev2010-10-062-38/+45
| | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Replaced the unnecessary include with declarationBoris Moiseev2010-10-062-2/+2
| | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Resolved some code style issues and fixed the broken copyright yearBoris Moiseev2010-10-065-39/+40
| | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Finally removed the qtconfig dependency from qt3supportBoris Moiseev2010-10-062-2/+1
| | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Modified previewwidget's ui file in qtconfigBoris Moiseev2010-10-061-7/+7
| | | | | | | The modification is needed to prevent ui compilation time warnings. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Fixed some code style issues in qtconfigBoris Moiseev2010-10-061-26/+3
| | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Refactored the MainWindow in qtconfigBoris Moiseev2010-10-067-696/+235
| | | | | | | | | qtconfig can now be fully build without qt3support module. Removed some legacy and unused code, changed one of labels on widget to reflect the real meaning of configuration parameter. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Refactored PaletteEditorAdvanced in qtconfigBoris Moiseev2010-10-068-1244/+623
| | | | | | | | | | | | The widget was redrawn and now makes use of QDialogButtonBox. The ColorButton's are created more correctly for now. Also, all of the Qt4 ColorRoles are now supported. All the legacy code was dropped so it must not depend of qt3support. Some refactoring job also was done and much of unused code was removed. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Removed more legacy code from qtconfig and fixed codestyle issuesBoris Moiseev2010-10-064-18/+17
| | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Refactored PreviewWidget in qtconfigBoris Moiseev2010-10-068-513/+285
| | | | | | | | Removed the legacy code and behavior. Now this part of qtconfig doesn't need the qt3support module to be built. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-062-3/+4
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adding a threshold for partial updates. Fixed arm X11 build.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-052-3/+4
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adding a threshold for partial updates. Fixed arm X11 build.
| | * Adding a threshold for partial updates.Michael Dominic K2010-10-051-2/+3
| | | | | | | | | | | | | | | Merge-request: 841 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Fixed arm X11 build.Samuel Rødal2010-10-051-1/+1
| | | | | | | | | | | | | | | | | | Without we get error: invalid conversion from 'const void*' to 'void*' Reviewed-by: Thiago Macieira
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-0626-326/+1032
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QDateEdit - Layout issues Quick fix for OSX and Windows/Mingw compilation errors. Fix gcc compilation problems in QtOpenGL. Actually was typo and Revert "When using complex transformations rendering goes easily off by one pixel." fix for USER: 163 panic found on 5800XM Fixed library ordering when linking to qtmain. Made javascriptcore depend on corelib. Enable QtOpenGL vector path caching on Symbian/IVE3 Made scripttools disabled on Symbian by default, like on Windows. Got rid of "No such directory" warning when shadow building. Added qmake check for presence of RHttpDownloadMgr header Fixed crash on startup in Symbian debug build fixed hybrid heap Symbian udeb build issues qmediaplayer: show buffer status of 0% Progressive download in Phonon MMF backend: integrated with player Progressive download in Phonon MMF backend: added download managers Remove partial upgrade deployment generation for Webkit
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-0626-326/+1032
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QDateEdit - Layout issues Quick fix for OSX and Windows/Mingw compilation errors. Fix gcc compilation problems in QtOpenGL. Actually was typo and Revert "When using complex transformations rendering goes easily off by one pixel." fix for USER: 163 panic found on 5800XM Fixed library ordering when linking to qtmain. Made javascriptcore depend on corelib. Enable QtOpenGL vector path caching on Symbian/IVE3 Made scripttools disabled on Symbian by default, like on Windows. Got rid of "No such directory" warning when shadow building. Added qmake check for presence of RHttpDownloadMgr header Fixed crash on startup in Symbian debug build fixed hybrid heap Symbian udeb build issues qmediaplayer: show buffer status of 0% Progressive download in Phonon MMF backend: integrated with player Progressive download in Phonon MMF backend: added download managers Remove partial upgrade deployment generation for Webkit
| * | QS60Style: QDateEdit - Layout issuesSami Merila2010-10-051-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In portrait orientation, QDateEdit's calendar popup (QCalendarWidget) does not fit into screen. As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from 13 to 3 in qHD screens (640*360). Also, the explicit halving of the pixel metric for QTableViews is removed. The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for calendar widgets, which is clearly a bit too much. Task-number: QTBUG-14126 Reviewed-by: Miikka Heikkinen
| * | Quick fix for OSX and Windows/Mingw compilation errors.Jani Hautakangas2010-10-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OSX AssertMacros.h header has macro called verify() and QRBTree::verify() function was substituted by this macro. On Windows/Mingw includes need to point to exported private include folder. Reviewed-by: Kim
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-0525-313/+1024
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix gcc compilation problems in QtOpenGL. Actually was typo and Revert "When using complex transformations rendering goes easily off by one pixel." fix for USER: 163 panic found on 5800XM Fixed library ordering when linking to qtmain. Made javascriptcore depend on corelib. Enable QtOpenGL vector path caching on Symbian/IVE3 Made scripttools disabled on Symbian by default, like on Windows. Got rid of "No such directory" warning when shadow building. Added qmake check for presence of RHttpDownloadMgr header Fixed crash on startup in Symbian debug build fixed hybrid heap Symbian udeb build issues qmediaplayer: show buffer status of 0% Progressive download in Phonon MMF backend: integrated with player Progressive download in Phonon MMF backend: added download managers Remove partial upgrade deployment generation for Webkit
| | * Fix gcc compilation problems in QtOpenGL. Actually was typo andJani Hautakangas2010-10-042-2/+7
| | | | | | | | | | | | | | | | | | for some reason rvct didn't catch that. Reviewed-by: TRUSTME
| | * Revert "When using complex transformations rendering goes easily off by one ↵Jani Hautakangas2010-10-041-92/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pixel." This reverts commit 2acdc634ee895af4a9738c0f6c2496e388afba38. Originally this fixed QT-3791 but it caused lots of problems in other sites. So reverting this will fix QT-4001 but reopens QT-3791. QT-4001 blocks Qt 4.7.1 but QT-3791 doesn't. Task-number: QT-4001 Reviewed-by: Jason Barron
| | * fix for USER: 163 panic found on 5800XMmread2010-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | The NO_NAMED_LOCAL_CHUNKS macro should have been set for S605.0 builds. Also for S60 3.2 and Symbian^2. All are added. Reviewed-by: Shane Kearns
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-0423-222/+954
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed library ordering when linking to qtmain. Made javascriptcore depend on corelib. Enable QtOpenGL vector path caching on Symbian/IVE3 Made scripttools disabled on Symbian by default, like on Windows. Got rid of "No such directory" warning when shadow building. Added qmake check for presence of RHttpDownloadMgr header Fixed crash on startup in Symbian debug build fixed hybrid heap Symbian udeb build issues qmediaplayer: show buffer status of 0% Progressive download in Phonon MMF backend: integrated with player Progressive download in Phonon MMF backend: added download managers Remove partial upgrade deployment generation for Webkit
| | | * Merge branch 'buildFixes' into 4.7-s60axis2010-10-043-7/+21
| | | |\
| | | | * Fixed library ordering when linking to qtmain.axis2010-10-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Done-with: Liang Qi Reviewed-by: Trust me
| | | | * Made javascriptcore depend on corelib.axis2010-10-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It lists "QT = core" in its profile, and may fail parallel builds if the dependency is not in place. RevBy: Benjamin Poulain
| | | | * Made scripttools disabled on Symbian by default, like on Windows.axis2010-10-041-1/+8
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * Got rid of "No such directory" warning when shadow building.axis2010-10-041-3/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander
| | | * | Enable QtOpenGL vector path caching on Symbian/IVE3Jani Hautakangas2010-10-044-134/+334
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IVE3 doesn't support UNSIGNED_INT <type> index values in DrawElements. This patch checks if GL_OES_element_index_uint extensions is supported and determines DrawElement indices type based on that. On desktop environment UNSIGNED_INT is always supported. Task-number: QTBUG-13563 Reviewed-by: Gunnar
| | | * Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-034-29/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | downloadmgrclient.h is not found on S^4 baselines, causing a build failure. This commit is a temporary workaround, which disables progressive download support if the header is not found. The correct solution is to determine whether the RHttpDownloadMgr definition has moved, and if so, to modify the .pro file to include the new path. Task-number: QTBUG-10769 Reviewed-by: TrustMe
| | | * Fixed crash on startup in Symbian debug buildGareth Stockwell2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a typo in a debug-only function in the hybrid heap allocator. The typo causes an assertion to fail during startup of applications, when using a debug build of Qt. Reviewed-by: mread
| | | * fixed hybrid heap Symbian udeb build issuesmread2010-10-013-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed name collision with TAllocFail Added definition for EDebugHdrSize and fixed scope issue Added definition for SRAllocatorBurstFail Added a definition for global enum ETHeapBadDebugFailParameter Tested compilation on: Symbian^3 RnD - armv5_urel, armv5_udeb, winscw_urel, winscw_udeb S60 3.1 SDK - armv5_urel, armv5_udeb S60 5.0 SDK - armv5_urel, armv5_udeb Symbian^3 PDK - armv5_urel, armv5_udeb Symbian^4 RnD - armv5_urel, armv5_udeb Basic functional testing on N8 armv5_urel Task-number: QTBUG-14168 Reviewed-by: Shane Kearns
| | | * qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During progressive download, it is not possible for the Symbian MMF Phonon backend to determine the buffering status, so it returns a value of 0%. This change causes qmediaplayer to display this value in the UI, thereby giving a visible notification of buffering during progressive download. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
| | | * Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-018-43/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit integrates the Download class with the media playback classes in the backend, to implement Progressive Download. Note that this PDL implementation has one drawback: when video playback is paused due to shortage of data (i.e. due to the download being temporarily stalled), the display goes black. This is because, when the end of the currently-downloaded data is reached, the playback session is closed. When more data becomes available, the clip is re-opened, a seek is done to reach the previous playback position, and playback is re-started. Closing the playback session closes the video stack's connection to the display, thereby causing the video widget to go black while more data is buffered. This is a consequence of the level in the native video stack at which the Phonon integration is done: managing a network stall without requiring the playback session to be closed would require integration below the MMF client API, specifically at the MMF controller level. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
| | | * Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-013-0/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a Download class which uses the RHttpDownloadMgr API to download a media clip over HTTP. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
| | | * Remove partial upgrade deployment generation for WebkitMiikka Heikkinen2010-10-011-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Generic partial upgrade package deployment generation in qbase.pri wrecks webkit pkg files. Reviewed-by: axis
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0548-353/+789
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Document and test paintedWidth and paintedHeight properties of Image Add missing license header. Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| * | | Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-052-0/+50
| | | | | | | | | | | | | | | | Task-number: QTBUG-14197
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0546-353/+739
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing license header. Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| * | | Add missing license header.Michael Brasser2010-10-041-0/+41
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0446-353/+698
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| | * | | Improve test coverage for declarative module.Michael Brasser2010-10-049-4/+76
| | | | | | | | | | | | | | | | | | | | Add additional autotests, and remove unreachable functions.
| | * | | Avoid potential null dereference.Martin Jones2010-10-042-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QT-4030
| | * | | Add autotest for reserved words in QML.Michael Brasser2010-10-041-0/+76
| | | | |
| | * | | Prevent crash in XmlListModel when appending an empty role.Michael Brasser2010-10-043-1/+19
| | | | |
| | * | | Remove unused, unexported class.Michael Brasser2010-10-043-260/+0
| | | | |
| | * | | Fix clipping behavior for non-cached text.Michael Brasser2010-10-042-2/+1
| | | | |
| | * | | CompileAaron Kennedy2010-10-042-0/+55
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14050
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0128-85/+470
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
generated by cgit v0.12 at 2024-12-27 11:50:59 (GMT)