summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17362-4120/+3252
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16356-4102/+3214
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-1610-43/+62
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Check S60_VERSION instead of existence of certain files in bearer plugin Fixed EPOCROOT references in createpackage.pl. Restore 4.7.0 behavior that non-existing paths are possible. QTBUG-4852 Turning on runtime nested exception support where available Fix warnings Fixed incorrect Symbian scoping. QS60style: itemview selection indication works incorrectly
| | | * Check S60_VERSION instead of existence of certain files in bearer pluginMiikka Heikkinen2010-09-162-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for existence of files does not work in clean platform builds, so check the S60_VERSION instead, which can be explicitly set by those builds to correct value. Task-number: QT-3949 Reviewed-by: axis
| | | * Fixed EPOCROOT references in createpackage.pl.axis2010-09-161-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The makefile build system does not require EPOCROOT to end in a slash. RevBy: Jani Hautakangas
| | | * Restore 4.7.0 behavior that non-existing paths are possible.Thomas Zander2010-09-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing a relative path to a non-existing absolute path used to work, this should work again after this patch. Reviewed-by: João Abecasis
| | | * QTBUG-4852 Turning on runtime nested exception support where availablemread2010-09-162-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added nested_exceptions.prf to the symbian mkspecs features, and used it from the stl.prf config. nested_exceptions.prf adds the .mmp flag to use the nested exceptions runtime support library for apps. stl.prf will add nested_exceptions to the config when the support library is present. Since this check depends on the existence of the runtime support library when qmake is run, qtp will have to add nested_exceptions to their config when building with nested exception support. This change means that, where nested exceptions are supported on Symbian, apps will no longer crash if a nested exception is encountered at runtime. Task-number: QTBUG-4852 Reviewed-by: Miikka Heikkinen
| | | * Fix warningsThomas Zander2010-09-162-2/+2
| | | |
| | | * Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| | | | | | | | | | | | | | | | The missing install functionality is only true for mmp based systems.
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-1639-210/+1564
| | | |\
| | | * | QS60style: itemview selection indication works incorrectlySami Merila2010-09-161-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QS60Style shows tick mark for listWidget with multiselection capability only after two or more items are selected. This is fixed so that selection indication is shown in multiselection itemviews (all of them and not just list widget) irregardless of number of selected items. Also, if itemview loses focus with singleitem itemview, style now still draws item highlight to it (with 50% transparency). Task-number: QTBUG-12875, QTBUG-13072 Reviewed-by: Janne Anttila
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-164-73/+174
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtDeclarative def files Optimize FontLoader for "multi-use".
| | | * | | Update QtDeclarative def filesJoona Petrell2010-09-162-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13419 Reviewed-by: Michael Brasser
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-167-3272/+131
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update add libconninet version 0.45. Remove libconninet in preperation to updating it to version 0.45. doc: Fixed a \overload
| | | * | | | Update add libconninet version 0.45.Aaron McCarthy2010-09-1634-0/+6836
| | | | | | |
| | | * | | | Remove libconninet in preperation to updating it to version 0.45.Aaron McCarthy2010-09-1636-9977/+0
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-161-1/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed a \overload
| | | | * | | doc: Fixed a \overloadThorbjørn Lindeijer2010-09-151-1/+1
| | | | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-16298-502/+1272
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | | * | | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After change 79eef278228aac21fbf QPixmap::size() started returning QSize(-1, -1) for null pixmaps. This restores the old behavior of returning QSize(0, 0), and is symmetric with QImage::size(). Task-number: QT-3934 Reviewed-by: Trond
| | | * | | | Make test less sensitive to platform specificsBradley T. Hughes2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zero timers on Windows are implemented using posted events, as are QueuedConnections, making the QTBUG13633_dontBlockEvents test sensitive to the order between invokeMethod() and starting a zero timer. Reviewed-by: Olivier
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-15297-501/+1271
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-15290-5606/+13296
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-154-20/+126
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first
| | | | | | * | | The test livelock of QTimer is now expected to workBenjamin Poulain2010-09-151-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the patch e3801c20bd3626c3c9c9fac110ee2f9e4269e3c8 of Olivier, this test is working for Mac as well. Reviewed-by: Olivier Goffart
| | | | | | * | | Make sure mapSelectionFromSource does not return a selection with invalid ↵Stephen Kelly2010-09-152-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ranges. Similar for mapSelectionToSource, but that one could possibly be an assert instead. Merge-request: 2474 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | | | | | * | | QEventDispatcherUnix: do not process too many timer if other events need to ↵Olivier Goffart2010-09-152-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be processed first Task-number: QTBUG-13633 Reviewed-by: Brad
| | | | * | | | | Doc: Further QML improvements.David Boddie2010-09-155-22/+114
| | | | | | | | |
| | | | * | | | | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-153-7/+6
| | | | | | | | |
| | | | * | | | | Doc: Continued work on the QML documentation.David Boddie2010-09-144-18/+143
| | | | | | | | |
| | | | * | | | | Doc: More work on the QML documentation.David Boddie2010-09-14127-183/+327
| | | | | | | | |
| | | | * | | | | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| | | | | | | | |
| | | | * | | | | Doc: Some editing and tidying up.David Boddie2010-09-134-51/+13
| | | | | | | | |
| | | | * | | | | Doc: Added a missing file.David Boddie2010-09-131-0/+193
| | | | | | | | |
| | | | * | | | | Doc: Fixed text in license headers.David Boddie2010-09-13149-147/+227
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-162-126/+240
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide a way to compile with RVCT 4.0 using generated Makefile.
| | | * | | | | | Provide a way to compile with RVCT 4.0 using generated Makefile.Miikka Heikkinen2010-09-162-126/+240
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_RVCT_VERSION environment variable can be used to specify the desired RVCT version for symbian-sbsv2 Makefiles: E.g. QT_RVCT_VERSION=4.0, release-armv6 -> sbs -c arm.v6.urel.rvct4_0 If no version is specified, generic sbsv2 rvct aliases are used just like before: E.g. release-armv6 -> sbs -c armv6_urel Version specific make targets are also generated for each detected compiler: E.g. release-armv6-rvct4.0 -> sbs -c arm.v6.urel.rvct4_0 Also optimized finding the installed compiler versions. Task-number: QTBUG-13499 Reviewed-by: axis
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1636-70/+1312
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile fix for static build using mingw. Models with a single role may not update due to "modelData" conflict. Fix test. Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894 Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39 Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894 crashfix for tst_qdeclarativeanimations::badTypes() Add missing images for dynamiclist example. Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| | | * | | | | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix follows the pattern of commit bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3. Reviewed-by: Martin Jones
| | | * | | | | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-164-10/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
| | | * | | | | | Fix test.Michael Brasser2010-09-161-2/+0
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1531-59/+1179
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894 Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39 Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894 crashfix for tst_qdeclarativeanimations::badTypes() Add missing images for dynamiclist example. Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| | | | * | | | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-153-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time the implementation of clear is correct Reviewed-by: Marco Bubke
| | | | * | | | | Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39Thomas Hartmann2010-09-152-0/+98
| | | | | | | | |
| | | | * | | | | Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-0/+2
| | | | | | | | |
| | | | * | | | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-09-152-4/+8
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1522-59/+1075
| | | | | |\ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| | | | * | | | | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | | | | |/ / / / | | | | |/| | | |
generated by cgit v0.12 at 2024-12-29 20:03:26 (GMT)