summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use QDeclarativeListProperty properlyAlan Alpert2010-03-231-1/+23
| | | | | Task-number: QTBUG-8713 Reviewed-by: Aaron Kennedy
* Remove non-existing header from pri fileKai Koehne2010-03-221-2/+1
| | | | Got added in 081fafe395d52.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1029/+886
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (23 commits) Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing Fix local type lookup ...
| * Fix Loader crash.Michael Brasser2010-03-225-1/+63
| | | | | | | | | | | | | | | | | | If setting the source of a Loader triggered a change to the source (i.e. the thing being loaded set the source to something else) a crash would occur. We now no longer delete the component immediately when the source changes. Task-number: QTBUG-9241
| * Compile in namespaceAaron Kennedy2010-03-221-1/+1
| |
| * Deprecate inline Script {} blocksAaron Kennedy2010-03-2238-366/+521
| | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
| * Update metaobjectbuilder version test.Martin Jones2010-03-221-4/+4
| | | | | | | | Task-number: QT-2918
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2228-568/+25
| |\
| | * Removed wrong parenthesis around property NOTIFY declarationLeonardo Sobral Cunha2010-03-221-1/+1
| | |
| | * Remove dead performance measurement code from QMLAaron Kennedy2010-03-2223-563/+2
| | |
| | * Fix warning mentioned in the comments of QTBUG-9182.Michael Brasser2010-03-221-3/+2
| | | | | | | | | | | | | | | Make sure the 'stackBefore' sibling in ParentChanges is cleared if the target is the last child.
| | * Fix test.Michael Brasser2010-03-223-1/+20
| | | | | | | | | | | | | | | Use a custom type to test this language feature, rather than PropertyChanges.
| * | Set role names for QFileSystemModel and QDirModelMartin Jones2010-03-224-0/+70
| |/ | | | | | | | | Task-number: QTBUG-7479 Reviewed-by: Alexis Menard
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-224-6/+13
| |\
| | * Fix qdeclarativeqt::createQmlObject autotestLeonardo Sobral Cunha2010-03-222-6/+8
| | | | | | | | | | | | The warning message expected in this test changed.
| | * Fix qdeclarativetextedit::delegateLoading autotestLeonardo Sobral Cunha2010-03-222-0/+5
| | | | | | | | | | | | After d039e2e8307, this test broke because of restricted remote imports.
| * | Ensure positioner animations are triggered correctlyMartin Jones2010-03-221-18/+25
| | | | | | | | | | | | Task-number: QTBUG-9219
| * | Add MiddleButton = MidButton to MouseButtons enum.Martin Jones2010-03-222-1/+3
| |/ | | | | | | | | Task-number: QTBUG-6617 Reviewed-by: Alexis Menard
| * Fix Behavior documentation due to easing changes.Martin Jones2010-03-211-1/+2
| |
| * Fix crash when calling createObject on a component with errors.Michael Brasser2010-03-213-0/+22
| |
| * Initialize variable.Michael Brasser2010-03-211-1/+1
| |
| * Produce an error when trying to create objects in a PropertyChanges.Michael Brasser2010-03-213-0/+28
| | | | | | | | | | | | | | State-specific object lifecycle management will be addressed in a future release. Task-number: QTBUG-8318
| * Fix Flipable crash.Michael Brasser2010-03-213-3/+23
| | | | | | | | Task-number: QTBUG-9161
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Reduce amount of qmldir parsing Fix local type lookup Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Reduce amount of qmldir parsing Fix local type lookup Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | * Reduce amount of qmldir parsingmae2010-03-194-34/+38
| | | | | | | | | | | | | | | | | | | | This is done by storing the parsed components (QDeclarativeDirComponents). There's still potential for optimization (QT-617)
| | | * Fix local type lookupmae2010-03-1910-17/+41
| | | | | | | | | | | | | | | | | | | | | | | | This change removes the hacky final baseUrl+TypeName+".qml" lookup. In order to still support internal files in remote modules, a new qmldir keyword "internal" is introduced.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-193-9/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | | * Initialize variable.Martin Jones2010-03-191-1/+1
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-192-1/+4
| | | | |\
| | | | * | Setting stacking order from top to bottom seems to work better.Martin Jones2010-03-191-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9182
| | | | * | Don't crash if an out of bounds model index is accessed.Martin Jones2010-03-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9184
* | | | | | 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.
| * | | | | 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