summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-2585-107/+779
|\
| * Revert "Reading/writing a non-existent property throws an exception"Aaron Kennedy2010-05-258-28/+34
| | | | | | | | This reverts commit 2b3e7706f4459569520c77b9fb3ff2bc006e60f1.
| * Revert "Always pass context to QObject script class"Aaron Kennedy2010-05-254-9/+6
| | | | | | | | This reverts commit d982ded10a3dd5219ae40a5a3574b63ac7bdda3f.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2573-113/+689
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Always pass context to QObject script class Reading/writing a non-existent property throws an exception Fix geolocation (untested) Doc License header. Example of a simple TextEditor look-and-feel. Fix benchmark warnings on symbian. Fix TextEdit implicit height. Integrate some QML examples and demos into qtdemo Fix typo
| | * Always pass context to QObject script classAaron Kennedy2010-05-254-6/+9
| | | | | | | | | | | | QTBUG-10659
| | * Reading/writing a non-existent property throws an exceptionAaron Kennedy2010-05-258-34/+28
| | | | | | | | | | | | QTBUG-10659
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-251-2/+2
| | |\
| | | * DocAaron Kennedy2010-05-251-2/+2
| | | |
| | * | FixWarwick Allison2010-05-251-4/+4
| | | |
| | * | geolocation (untested)Warwick Allison2010-05-251-0/+8
| | |/
| | * License header.Warwick Allison2010-05-252-0/+82
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-254-13/+13
| | |\
| | | * Fix benchmark warnings on symbian.Michael Brasser2010-05-244-13/+13
| | | |
| | * | Example of a simple TextEditor look-and-feel.Warwick Allison2010-05-253-6/+90
| | | | | | | | | | | | | | | | Task-number: QTBUG-10940
| | * | Fix TextEdit implicit height.Warwick Allison2010-05-241-1/+1
| | |/
| | * Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2452-47/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes minor changes and additions to the existing doc and examples, so that they follow Qt conventions better. Note that while blurring the background was part of the plan for the embedded QML viewer I could not get it to perform well enough. In the future, when blur is fast enough (or someone else can get it to perform better than I) -use-blur should become the default, and -no-blur the option. Task-number: QTBUG-10582
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-241556-33869/+44051
| | |\
| | * | Fix typoAlan Alpert2010-05-241-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-251-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compile with xlC.
| | * | | Fixed compile with xlC.Rohan McGovern2010-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given `flags |= foo | bar;', where `flags' is a bitfield, xlC says: The bit-field "flags" cannot be bound to a non-const reference `flags |= foo; flags |= bar;' works.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-248-8/+60
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Added autotest for Component.createObject() without Qt.createComponent()
| | * | | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-248-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2415-30/+80
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compiler warning Remove incorrect ASSERT Be slightly more verbose on assigning undefined in binding. Doc fixes Don't crash when assigning a Behavior to a grouped property. Get rid of 'noise' when using GL and the top-level item is an Item. Fix visual tests after rename of the qml executable. Do not attempt to setParent of object in a different thread Don't polish QDeclarativeItems.
| | * | | Compiler warningAaron Kennedy2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | QTBUG-10816
| | * | | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
| | | | | | | | | | | | | | | | | | | | QTBUG-10832
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-248-10/+48
| | |\ \ \
| | | * | | Doc fixesYann Bodson2010-05-242-5/+5
| | | | | |
| | | * | | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-244-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10799 Reviewed-by: Aaron Kennedy
| | | * | | Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10911
| | | * | | Fix visual tests after rename of the qml executable.Michael Brasser2010-05-241-3/+3
| | | | | |
| | * | | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-243-7/+9
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-10303
| | * | | Do not attempt to setParent of object in a different threadWarwick Allison2010-05-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkAccessManager::setCookieJar used to give an error message, now it documents the behavior and avoids the warning. Task-number: QTBUG-10554
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-24296-421/+11468
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Check QML files for license headers too. Make compile: include script module for test Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate Allow resource files to be loaded in WorkerScript Fix TextEdit alignment. Component::createObject() don't attempt to set parent of null object Factor out initialization effects from declarative benchmarks. Remove license headers from test data. Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Ensure QML Global Qt object functions appear in the documentation index doc Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
* | | | | | Remove old symbian specific IAP initialization.Martin Jones2010-05-253-32/+0
| |_|/ / / |/| | | |
* | | | | Don't polish QDeclarativeItems.Warwick Allison2010-05-242-6/+16
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids unnecessary processing and assumptions we would not want to preserve in the future. Task-number: QTBUG-10217 Reviewed-by: Martin Jones
* | | | Check QML files for license headers too.Warwick Allison2010-05-241-3/+11
| | | | | | | | | | | | | | | | (but not test data - no test data has license headers)
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2416-93/+62
|\ \ \ \
| * | | | Make compile: include script module for testBea Lam2010-05-241-1/+1
| | | | |
| * | | | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-2410-94/+34
| | | | |
| * | | | Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
| | | | |
| * | | | Component::createObject() don't attempt to set parent of null objectMartin Jones2010-05-241-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Don't try to set graphics item parent on an object that is not a QGraphicsItem
| * | | | Factor out initialization effects from declarative benchmarks.Michael Brasser2010-05-244-0/+19
| | | | |
* | | | | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Vertical never worked. Horizontal broke at 633b4b0655bf47b6f5100ee9a6c2f692b0aeb081. Task-number: QTBUG-10895
* | | | Remove license headers from test data.Warwick Allison2010-05-23958-39276/+0
| | | | | | | | | | | | | | | | Partial revert of d5a86d924bfe331aeba6465b0f249cd27ef83ad4
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-232472-33422/+82636
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211233-59/+50334
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211233-59/+50334
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| | | * | | Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-214-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3315 Reviewed-by: Martin Jones
| | | * | | Add license headers for .qml files.Jason McDonald2010-05-211227-0/+50179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-211235-33396/+32305
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (62 commits) Fix warnings Fix shadow building of spectrum demo Doc: Removed a link to missing external online documentation. Fixes QGraphicsItem::scroll issues Fixes wrong QGraphicsItemCache::boundingRect. changes-4.7.0 updated Revert "Deselect the current selection when the QItemSelectionModel::model is reset." add missing include Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Doc: Updated example license to three clause BSD license. ...
generated by cgit v0.12 at 2024-10-26 20:37:59 (GMT)