summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-221182-20115/+40407
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-2225-257/+658
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed inconsistent test naming. Add a selftest to enforce correct test naming conventions. Make maketestselftest more strict.
| | * Fixed inconsistent test naming.Rohan McGovern2010-03-2221-255/+251
| | | | | | | | | | | | TARGET and test class name should always match.
| | * Add a selftest to enforce correct test naming conventions.Rohan McGovern2010-03-222-9/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a test runs successfully, it outputs an XML test log, with the testcase name coming from whatever class is passed to QTest::qExec. If a test crashes, hangs, fails to compile, or otherwise fails to output a valid test log, any summary of the test results still has to display some reasonable testcase name. But we can't tell what the testcase name _would_ have been had the test run correctly - without, for example, attempting to parse the C++. The simplest solution is to make sure that TARGET and the test class name are always matching. This test will force people to follow this naming convention.
| | * Make maketestselftest more strict.Rohan McGovern2010-03-223-2/+143
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-219-54/+126
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusion Use libusb to auto-detect the port to use to communicate with the phone Whitespace Make multimedia only depend on opengl when the latter is build gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
| | * | Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusionMiikka Heikkinen2010-03-191-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $${DIR_SEPARATOR} wasn't yet declared in the previous place. This was only a problem for projects built outside Qt tree, as .qmake.cache also redefined these variables. Reviewed-by: axis
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-198-47/+118
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use libusb to auto-detect the port to use to communicate with the phone Whitespace Make multimedia only depend on opengl when the latter is build gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
| | | * | Use libusb to auto-detect the port to use to communicate with the phoneThomas Zander2010-03-193-15/+85
| | | | |
| | | * | WhitespaceThomas Zander2010-03-194-38/+38
| | | | |
| | | * | Make multimedia only depend on opengl when the latter is buildThomas Zander2010-03-191-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-By: axis
| | | * | gcc for Symbian doesn't support gcc extensions like atomicity.h - disableIain2010-03-192-4/+4
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-214-4/+42
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Let QImageReader open the device if it is not open already Make an attemt to upload QPixmap in the most optimal format on 16-bit clicking on a non focused ItemView would change the cirrent item twice
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-191-2/+9
| | |\ \ \
| | | * | | Make an attemt to upload QPixmap in the most optimal format on 16-bitGunnar Sletta2010-03-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 16-bit configs, using 16-bit textures gives us quite a bit of performance extra, so making this extra effort prior to uploading it seems worth it. Reviewed-by: Samuel
| | * | | | Let QImageReader open the device if it is not open alreadyaavit2010-03-191-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | This brings the actual behaviour in line with the doc of setDevice(). Reviewed-by: Trond
| | * | | clicking on a non focused ItemView would change the cirrent item twiceThierry Bastian2010-03-192-1/+32
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-8086 Reviewed-by: gabi
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-193-7/+7
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed an assert in the print dialog on windows simple cleanup in QSplitter Actually use GL texture cache when bindoptions are provided
| | * | Removed an assert in the print dialog on windowsThierry Bastian2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This assert was checking that the parent widget for the print dialog was already created. That's useless since we immediately after call winId(). Task-number: QTBUG-8684 Reviewed-by: gabi
| | * | simple cleanup in QSplitterThierry Bastian2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | there is no need for a singleshot for deleteLater here Reviewed-by: gabi
| | * | Actually use GL texture cache when bindoptions are providedGunnar Sletta2010-03-191-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-198-150/+364
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add autoLoad property to multimedia declarative elements. Fix; QML Video item is sensitive to property assignment order
| | * | | Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-197-8/+90
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8947 Reviewed-by: Andrew den Exter
| | * | | Fix; QML Video item is sensitive to property assignment orderJustin McPherson2010-03-198-149/+281
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8605 Reviewed-by: Andrew den Exter
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-19289-3772/+7293
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits) Skip until after CI succeeds Fixed install of qml imports when doing a vcproj build. Disable tests temporarily Remove warnings Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test ...
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-19289-3772/+7293
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits) Skip until after CI succeeds Fixed install of qml imports when doing a vcproj build. Disable tests temporarily Remove warnings Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test ...
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-19139-1607/+3098
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-19139-1607/+3098
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | Skip until after CI succeedsMartin Jones2010-03-191-0/+3
| | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-1935-292/+384
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeecmascript/testtypes.h
| | * | | | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This qmake script had wrong logic as a result of a bad copy and paste (probably from translations\translations.pro)
| | * | | | Disable tests temporarilyBea Lam2010-03-191-0/+3
| | | | | |
| | * | | | Remove warningsYann Bodson2010-03-182-29/+31
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash ...
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash ...
| | | | * | | | Add missing semicolons. moc was confused and positionViewAtIndex not invokable.Yann Bodson2010-03-182-2/+2
| | | | | | | |
| | | | * | | | Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
| | | | | | | |
| | | | * | | | Remove timing sensitivity.Warwick Allison2010-03-181-2/+2
| | | | | | | |
| | | | * | | | Optimize id checking.Warwick Allison2010-03-181-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id must be lowercase; types and namespaces must be uppercase cannot conflict, so remove check.
| | | | * | | | Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Yann Bodson2010-03-187-0/+0
| | | | | | | |
| | | | * | | | Don't use QScriptValueIterator to iterate over arrays.Bea Lam2010-03-181-4/+3
| | | | | | | |
| | | | * | | | Skip test, to be fixed.Bea Lam2010-03-181-0/+2
| | | | | | | |
| | | | * | | | Only release the binding once we're finished with its memoryAaron Kennedy2010-03-181-1/+1
| | | | | | | |
| | | | * | | | Make it harder to accidentally delete a bindingAaron Kennedy2010-03-181-5/+7
| | | | | | | |
| | | | * | | | Adjust test now that redundant contexts are not create dueWarwick Allison2010-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to commit 26cd94ef47ffc969dc835e98b58eded14e669964.
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1825-62/+73
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1824-38/+39
| | | | | |\ \ \ \
| | | | | | * | | | Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Michael Brasser2010-03-1824-38/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The import order has changed, so test files that mirror element names needed to be renamed (or they would resolve as the type).
| | | | | * | | | | Don't destroy cookie jar until while someone may be using it.Martin Jones2010-03-181-24/+34
| | | | | |/ / / /
| | | | * | | | | Block modifications to internal QDeclarativeContextsAaron Kennedy2010-03-182-1/+50
| | | | |/ / / /
generated by cgit v0.12 at 2025-08-26 13:48:55 (GMT)