summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2426-374/+1128
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Abort open early if network session is in the process of openning. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for QTMOBILITY-253 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for MOBILITY-965 from Qt Mobility. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-853 from Qt Mobility. Cherry pick fix for MOBILITY-1047 from Qt Mobility. Merge bearermanagement changes from Qt Mobility. Cherry pick fix for MOBILITY-1031 from Qt Mobility. Cherry pick fix for MOBILITY-938 from Qt Mobility. Cherry pick fix for QTMOBILITY-240 from Qt Mobility. Make QtFontFamily::symbol_checked a bitfield.
| * Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| |
| * Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-70/+61
| | | | | | | | 21abc07dc396f08c888bf3cac96b535cc296cb00
| * Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | | | | | | | 4713262c16cb3eba1f4beccb6962a1ae210479c0
| * Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| | | | | | | | f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
| * Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-242-57/+96
| | | | | | | | 37ad80914f7acb8d4f3364d78e75d48cd14e8e2a
| * Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | | | | | | | 50de830ded2dcc1c6b4d8be71428d9a2bfed6ae7
| * Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-7/+31
| | | | | | | | a05504d2a0c643c6f253527f07bcc0dba8a799b4
| * Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | | | | | | | 256e67963c4cb0fc150e6c47193e7c9b17296611
| * Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
| | | | | | | | 4f74cd44d77349759096bed091913b188a9167e4
| * Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-2410-8/+358
| | | | | | | | cba220f177154428d6103a93a819668be689a591
| * Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
| | | | | | | | 7e8b55524bd8a00e49e11103e8c8091e1e59e612
| * Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-246-159/+223
| | | | | | | | 216f4016d1b447d51630086afca179df11fd6997
| * Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
| | | | | | | | c84a6d828bcb7f66d1ac06e1a7a84c5a8ba9cec4
| * Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
|/ | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2314-33/+68
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We need to swallow the event, otherwise it might pop up several times. Set the item data thru the model, so we actually emit dataChanged. There where still references to the old Assistant. Newly created folders in QFileDialog are disabled on Cocoa. don't remove the path from the name of included files add some comments remove support for QMAKE_POST_INCLUDE_FILES remove unused function fix prompt() stdin safety check Improve text performance with QtWebKit in Qt 4.7 Removed support for static linking of QtWebKit. When a drag is finished with on Mac, then it should delete itself
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| |\
| * | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| | | | | | | | | | | | Reviewed-by: kh
| * | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | | | | | | | | | | | | | | Task-number: QTBUG-10629 Reviewed-by: kh
| * | There where still references to the old Assistant.kh12010-06-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-11651
| * | Newly created folders in QFileDialog are disabled on Cocoa.Prasanth Ullattil2010-06-231-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | For a newly created folder in the current path, we were returning NO for the "shouldShowFilename" callback. This patch moves the check for directories to the begining. Task-number: QTBUG-11532 Reviewed-by: Carlos Duclos
| * | don't remove the path from the name of included filesOswald Buddenhagen2010-06-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | it is not done for the top-level file, either. this is minimally behavior-incompatible, but anyone relying on the old behavior (and thus not using $$basename()) should be shot anyway. :) Reviewed-by: joerg
| * | add some commentsOswald Buddenhagen2010-06-231-2/+2
| | |
| * | remove support for QMAKE_POST_INCLUDE_FILESOswald Buddenhagen2010-06-232-11/+1
| | | | | | | | | | | | | | | | | | | | | google has no mention of it except for a single orphaned instance in our own source code => trash. Reviewed-by: joerg
| * | remove unused functionOswald Buddenhagen2010-06-231-4/+0
| | |
| * | fix prompt() stdin safety checkOswald Buddenhagen2010-06-231-1/+1
| | | | | | | | | | | | Reviewed-by: joerg
| * | Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | Implemented the straight string-to-glyph conversion in the core text font engine, that bypasses the shaping. This is used by the fast text code path in QtWebKit. Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-233-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Static linking of WebKit is not going to be supported anymore in Qt 4.7, so this commit makes sure it's mentioned in the documentation and that configure disables WebKit if static linking of Qt is requested. Reviewed-by: Andy Shaw <qt-info@nokia.com>
| * | When a drag is finished with on Mac, then it should delete itselfAndy Shaw2010-06-232-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On other platforms then when a drag is finished then it cleans up by calling setMimeData(0) and deleteLater() on the drag object, this didn't happen before on the Mac which meant it did not delete the QDrag objects until the parent of them was deleted thus taking up memory. Task-number: QTBUG-11613 Reviewed-by: Prasanth
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-235-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide the Webkit Qml plugin with a UID3 on Symbian Provide Qml plugins with UID3s on Symbian Fix "missing store_build" errors
| * | | Provide the Webkit Qml plugin with a UID3 on SymbianAlessandro Portale2010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...otherwise we cannot Symbian sign it. Reviewed-by: Miikka Heikkinen
| * | | Provide Qml plugins with UID3s on SymbianAlessandro Portale2010-06-233-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | ...otherwise we cannot Symbian sign them. Reviewed-by: Miikka Heikkinen
| * | | Fix "missing store_build" errorsMiikka Heikkinen2010-06-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a dummy store_build target in projects that do not deploy anything when building for symbian-abld. Task-number: QTBUG-11656 Reviewed-by: Janne Koskinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-232-0/+129
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-232-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in the the video widget example not being able to play some gif files. Task-number: MOBILITY-1137 MOBILITY-1138 Reviewed-by: Justin McPherson
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-231-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Build declarative before webkit.
| * | | Build declarative before webkit.Alexis Menard2010-06-231-2/+2
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build on Symbian^3.
| * | | Fix build on Symbian^3.Aaron McCarthy2010-06-221-0/+1
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2217-104/+132
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Handle TextInput inputMethodEvent() properly Remove transparent.qml example for now, until QTBUG-11591 is fixed qmldir no longer necessary Add demo thumbnails to Examples/Demos index to make it more interesting Doc Allow QT_TR_NOOP (as a no-op) in ListModel values.
| * \ \ \ Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-221573-45368/+32945
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: examples/declarative/modelviews/webview/transparent.qml
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-222-6/+18
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix a crash on exit. Destruction order in font database. (Symbian^4)
| * | | | Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-222-6/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation for the QT_2746 task had a wrong destruction order of font database elements. The 'QSymbianTypeFaceExtras' in Symbian^4 hold a CFont which is retrieved from the Symbian ScreenDevice. They have to be released by the same ScreenDevice. The error was that the release was attempted after the connection to the ScreenDevice was closed. This fix causes an earlier destruction of all 'QSymbianTypeFaceExtras' and the removal of their their CFonts in qt_cleanup. While the connection to the ScreenDevice is still alive. Task-number: QT_2746
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-228-9/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed unnecessary data_caging_paths.prf loading from applications
| * | | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-228-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-221457-37974/+30543
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) doc: Added more DITA output to the XML generator Prohibit some property names to be used for dynamic properties Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 doc: Added more DITA output to the XML generator doc: Added more DITA output to the XML generator qdoc3: Build fix for regression in f321a3f2b1e Clean up HB_Anchor's DeviceTables on failure when loading format 3 Make sure ValueRecord's DeviceTables is cleaned up on failure qdoc3: Build fix for regression in e2f0e728e Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup Fix null HB_Device** dereference on exit in Harfbuzz GPOS code Doc: Relicensed the documentation under the GNU FDL version 1.3. doc: Added more DITA output to the XML generator Designer: Prevent QButtonGroup from being added for Q3ButtonGroup. Fix for a leak in the mac style. Doc: Fixing bugs to style and script doc: Added more DITA output to the XML generator Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() Fix compiler warnings in QtGui (text,painting). Allow Unix to generate unique UUIDs if /dev/urandom exists. ...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2299-7343/+2341
| |\ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-222-4/+7
| |\ \ \ \
| | * | | | Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since they are used internally for some legacy stuff. We prohibit "groupButtonId" and "database". Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-11584
| | * | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 * Import f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 which fixes a crash with certain fonts.
generated by cgit v0.12 at 2024-10-26 06:42:28 (GMT)