summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-216-95/+95
| | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-211-29/+79
|\
| * Fix parsing of regular expression literals.Roberto Raggi2010-04-211-29/+79
| | | | | | | | | | | | | | Recognize regular expression classes and escape sequences. Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-2111-21/+36
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-21122-1287/+2172
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits) Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). Update strings in test remove debugs Make the dynamic creation functions on the Qt object More focus example cleanup. Autotests Add hasModelChildren property to delegates with QAbstractItemModel model type. Emit released and hoveredChanged in MouseArea when a UngrabMouse is received Balance grid items for larger displays. Autotest Cleanup declarative focus example. Add forceFocus method to QDeclarativeItem. Don't allow properties in Component elements Fix crash when QDeclarativeInfo objects are copied Ignore message in QDeclarativeLoader test. Fix crash. Fix qmlvisual/animation/parentAnimation autotest delete the viewer before calling exit(). Ensures correct cleanup. ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2011-21/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| | * | QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe
| | * | QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann
| | * | WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann
| | * | WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann
| | * | WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen
| | * | WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-2146-593/+1191
|\ \ \ \ | | |_|/ | |/| |
| * | | Compile without Qt3 support.Yann Bodson2010-04-211-25/+25
| | | |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21139-2083/+3240
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-211-1/+3
| | |\ \ \
| | | * | | Emit released and hoveredChanged in MouseArea when a UngrabMouse is receivedLeonardo Sobral Cunha2010-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unbgrab mouse happens when the mouse area is inside a flickable and the flickables takes control over the mouse handling. In this case, the UngrabMouse will behave similarly to a MouseRelease, emitting released, pressedChanged and hoveredChanged. Visual autotest added to mousearea in qmlvisual. Reviewed-by: Michael Brasser
| | * | | | Add hasModelChildren property to delegates with QAbstractItemModel model type.Martin Jones2010-04-212-39/+71
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some helper function to VisualDataModel: - VisualDataModel::modelIndex(int) returns a QModelIndex which can be assigned to VisualDataModel::rootIndex - VisualDataModel::parentModelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex
| | * | | Add forceFocus method to QDeclarativeItem.Yann Bodson2010-04-212-2/+20
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | * | | Don't allow properties in Component elementsAaron Kennedy2010-04-211-0/+7
| | | | | | | | | | | | | | | | | | | | QTBUG-10082
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-217-67/+129
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-216-66/+126
| | | |\ \ \
| | | | * | | Fix qmlvisual/animation/parentAnimation autotestLeonardo Sobral Cunha2010-04-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transformOriginPoint was not up tp date when used in ParentChange after this commit: 575f0064bd91e26daa75805c142c10a04a32c2fd. Reviewed-by: Michael Brasser
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-211-2/+4
| | | | |\ \ \
| | | | | * | | Remove \internal from QDeclarativePropertyValueSource. It should beBea Lam2010-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public according to the docs.
| | | | * | | | Fix highlight position with StrictlyEnforceRange and range greater than item ↵Martin Jones2010-04-214-63/+118
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size. Task-number: QTBUG-9901
| | | * | | | Fix crash.Warwick Allison2010-04-211-1/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | * | | | Fix crash when QDeclarativeInfo objects are copiedAaron Kennedy2010-04-212-81/+78
| | |/ / /
| | * | | docWarwick Allison2010-04-204-12/+23
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-208-222/+377
| | |\ \ \
| | | * | | Allow null to be assigned to object propertiesAaron Kennedy2010-04-202-1/+11
| | | | | |
| | | * | | Fix AnchorChanges to work with parent.right.Michael Brasser2010-04-206-221/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "parent" needs to be evaluated with the AnchorChanges target as the scope object. Task-number: QTBUG-5338
| | * | | | Pass double clicks like other mouse events.Warwick Allison2010-04-201-0/+2
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-9940
| | * | | CompileWarwick Allison2010-04-201-2/+0
| | | | |
| | * | | Improve error messages, especially on embedded.Warwick Allison2010-04-2013-22/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With embedded, it is often the case that some QT_NO_* features are turned off (eg. QT_NO_XMLPATTERNS), which in turn leads to QML types not being available.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-203-9/+36
| | |\ \ \
| | | * | | Add drag.active property to MouseArea in qmlLeonardo Sobral Cunha2010-04-203-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The drag.active property specifies if the target item is being dragged. Task-number: QTBUG-9833 Reviewed-by: Martin Jones
| | * | | | Handle overrides correctly in extension objectsAaron Kennedy2010-04-201-2/+73
| | |/ / / | | | | | | | | | | | | | | | QTBUG-7817
| | * | | Allow Loader sourceComponent to be set to undefeined.Martin Jones2010-04-202-2/+11
| | | | |
| | * | | Doc fix.Michael Brasser2010-04-191-3/+10
| | | | |
| | * | | Minor internal anchor refactoring.Michael Brasser2010-04-195-113/+112
| | | | |
| | * | | Doc clarification.Michael Brasser2010-04-191-2/+4
| | | | |
| * | | | Make the dynamic creation functions on the Qt objectAlan Alpert2010-04-212-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated examples to still work, and the dynamic example now uses exceptions a little, to demonstrate that it can be done. Exceptions are also now filled out with the QML error data. Task-number: QT-2801 Reviewed-by: Aaron Kennedy
* | | | | Fill out QGraphicsLayout bindingsAlan Alpert2010-04-212-3/+187
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | The QGraphicsLayout API is too imperative for good bindings, but now it is at least possible to initialize values in QML. Task-number: QTBUG-5760
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-1993-1564/+2119
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: doc/src/template/style/style.css tools/qdoc3/htmlgenerator.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1914-128/+99
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1814-128/+99
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1714-128/+99
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | | | * | | Some QWindowSurface implementations might implement flush as a bufferBjørn Erik Nilsen2010-04-164-24/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flip. Such window surfaces therefore destroy the contents during flush. In order to render correctly on these surfaces, any update, no matter how small, needs to trigger the entire window to be redrawn. Auto test included. Task-number: Relates to QTBUG-9978 Reviewed-by: tom
generated by cgit v0.12 at 2025-01-19 02:27:10 (GMT)