summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-244-4/+33
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added extra video buffer handle types. QuickTime MovieViewOutput: remove view from layout and reset source
| | * Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
| | | | | | | | | | | | | | | | | | | | | XvShmImageHandle for XVideo shared memory image on X11 and and CoreImageHandle for CIImage on Mac OS X. Reviewed-by: Justin McPherson
| | * 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 4.7Dmytro Poplavskiy2010-03-161-1/+1
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-15177-3724/+5250
| | |\ \ \
| | * | | | QuickTime MovieViewOutput: remove view from layout and reset sourceDmytro Poplavskiy2010-03-112-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | movie when MovieViewOutput output is disabled. Reviewed-by: Justin McPherson
* | | | | | Fix leak.Michael Brasser2010-03-241-1/+2
| | | | | |
* | | | | | StateChangeScript doc.Michael Brasser2010-03-241-2/+24
| | | | | |
* | | | | | A StateChangeScript should never be run when leaving the state.Michael Brasser2010-03-242-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a Transition running in reverse, stop ScriptAction from running any StateSchageScripts.
* | | | | | ScriptAction doc.Michael Brasser2010-03-241-0/+31
| | | | | |
* | | | | | Rename stateChangeScriptName to scriptName.Michael Brasser2010-03-244-4/+5
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2435-599/+744
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2415-341/+92
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2413-94/+254
| | |\ \ \ \ \ \
| | * | | | | | | Document QML security considerations.Warwick Allison2010-03-242-0/+91
| | | | | | | | |
| | * | | | | | | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-245-207/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this feature too prone to accidental misuse and abuse.
| | * | | | | | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-248-134/+1
| | | | | | | | |
| * | | | | | | | DocAaron Kennedy2010-03-241-246/+206
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix abort in flipableLeonardo Sobral Cunha2010-03-242-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipable was calling updateSceneTransformFromParent, but this can only called when the the parent's scene transform is guaranteed to be updated, which is not the case in flipable. Task-number: QTBUG-8474 Reviewed-by: bnilsen
| * | | | | | | Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-248-8/+52
| | | | | | | |
| * | | | | | | Properly use one thread for all instances of XmlListModel.Bea Lam2010-03-243-83/+188
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
| * | | | | | Make compile.Michael Brasser2010-03-241-1/+1
| | | | | | |
| * | | | | | Output all Loader errors.Michael Brasser2010-03-244-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were not outputting those that occurred on component->create().
| * | | | | | Fix Loader leak when loading a non-QGraphicsObject object.Michael Brasser2010-03-243-1/+23
| | | | | | |
| * | | | | | Use setParent_NoEvent in Loader and benchmark Loader performance.Michael Brasser2010-03-246-2/+71
| | | | | | |
| * | | | | | Animation construction optimization.Michael Brasser2010-03-243-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use setParent_NoEvent when parenting to group.
| * | | | | | Origin safety testing for imported resources.Warwick Allison2010-03-247-15/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion.
* | | | | | | Fix flicking views at boundary with StricthighlighRangeMartin Jones2010-03-243-44/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9256
* | | | | | | Doc: ids start with lowercaseMartin Jones2010-03-241-9/+9
|/ / / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-2326-187/+636
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2315-121/+478
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed usage of xplatform in configure. Fixed mif generation on symbian-abld. Fixed regular expression matching. More fool proof way for finding these headers Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds Disable OpenVG for symbian-sbsv2 on Linux. Corrected wrong header casing. Moved -s60 and -usedeffiles options docs to Symbian section. Added rpp and rsg files to ignore filter. Forced little endianness when using symbian-sbsv2 mkspec. Fixed incorrect platform string when building for Symbian. Added -qt-style-s60 to Symbian configure options on Linux.
| | * \ \ \ \ Merge branch 'configureFixes' into 4.7-s60axis2010-03-232-8/+42
| | |\ \ \ \ \
| | | * | | | | Fixed usage of xplatform in configure.axis2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XQMAKESPEC contains the full path, so don't use that, since the full path could contain "symbian" by accident.
| | | * | | | | Merge branch 'linux-symbian-sbsv2-support' into 4.7-s60axis2010-03-232-8/+42
| | | |\ \ \ \ \
| | | | * | | | | Disable OpenVG for symbian-sbsv2 on Linux.axis2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * | | | | Corrected wrong header casing.axis2010-03-151-1/+1
| | | | | | | | |
| | | | * | | | | Moved -s60 and -usedeffiles options docs to Symbian section.axis2010-03-151-6/+5
| | | | | | | | |
| | | | * | | | | Added rpp and rsg files to ignore filter.axis2010-03-151-0/+2
| | | | | | | | |
| | | | * | | | | Forced little endianness when using symbian-sbsv2 mkspec.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * | | | | Fixed incorrect platform string when building for Symbian.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * | | | | Added -qt-style-s60 to Symbian configure options on Linux.axis2010-03-151-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | | | | | | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
| | * | | | | | | Fixed regular expression matching.axis2010-03-231-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need extra backslashes, otherwise it tries to match the '|' verbatim.
| | * | | | | | More fool proof way for finding these headersThomas Zander2010-03-231-1/+1
| | | | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2313-111/+431
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2313-111/+431
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2213-111/+431
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | | * | | | | | Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6cShane Kearns2010-03-226-77/+384
| | | | | | | | | | |
| | | | | * | | | | | Enable installation of a sis file without running any applicationShane Kearns2010-03-221-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "runonphone --sis qt.sis" Would install qt to the phone without attempting to execute any test afterwards. This feature is added because people were using runonphone as a fast way to install sis files from the command shell. Reviewed-by: axis
generated by cgit v0.12 at 2025-08-18 11:04:03 (GMT)