summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-0217-60/+818
| | | | Reviewed-by: akennedy
* Example of text focus.Warwick Allison2010-03-021-0/+83
| | | | Task-number: QT-448
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-02144-600/+1014
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add docs and tests for WorkerListModel. Add accessor operations to VisualItemModel::children Make "on" syntax mandatory for value sources and interceptors Fix warning. Minor optimization. Test GridView.onAdd & GridView.onRemove. Reduce wait()s Replace remaining QGuard usage with QDeclarativeGuard. Reapply "Some animation cleanup/refactoring." Setting the same source again causes reload. Expand documention of status property with examples Document TextEdit::textMargin use ParentAnimation
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-02131-596/+560
| |\
| | * Add accessor operations to VisualItemModel::childrenAaron Kennedy2010-03-021-1/+10
| | |
| | * Merge branch 'master' into 4.7Aaron Kennedy2010-03-02121-545/+469
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-0235-95/+178
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-03-0133-82/+166
| | | | |\
| | | | * | use ParentAnimationYann Bodson2010-03-011-12/+16
| | | | | |
| | | * | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-02120-532/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
| | * | | | Fix warning.Michael Brasser2010-03-021-1/+0
| | | | | |
| | * | | | Minor optimization.Michael Brasser2010-03-021-2/+3
| | | | | |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-0233-109/+265
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-026-17/+29
| | | |\ \ \ \
| | | | * | | | Replace remaining QGuard usage with QDeclarativeGuard.Michael Brasser2010-03-014-5/+9
| | | | | | | |
| | | | * | | | Reapply "Some animation cleanup/refactoring."Michael Brasser2010-03-012-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 543c4b82e6d6cc4a396b1c105d7321643b6ef4c6. Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| | | * | | | | Test GridView.onAdd & GridView.onRemove. Reduce wait()sMartin Jones2010-03-012-26/+39
| | | |/ / / /
| | | * | | | Setting the same source again causes reload.Martin Jones2010-03-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8623
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-012-3/+4
| | |\ \ \ \ \
| | * | | | | | Document TextEdit::textMarginAlan Alpert2010-03-011-0/+5
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Add docs and tests for WorkerListModel.Bea Lam2010-03-029-3/+414
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Task-number: QT-2807
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-014-1/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Expand documention of status property with examples
| | * | | | | Expand documention of status property with examplesAlan Alpert2010-03-014-1/+40
| | | |/ / / | | |/| | | | | | | | | | | | | | | Task-number: QTBUG-8542
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-015-32/+60
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-015-32/+60
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| | * | | | removed dead codeThierry Bastian2010-03-011-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: denis
| | * | | | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-013-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adapt QTestLib not to call invokeMethod on unexisting method to avoid warnings Task-number: QTBUG-7331 Reviewed-by: Brad
| | * | | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 4.7 port of d04f5336f769d9e5d2f9105e1da4a7d23ea91795. Task-number: related to QTBUG-8455 Reviewed-by: Kim
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0121-61/+152
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: typo for windows ce exclusion rule Updated .gitignore with the new name of the qmlviewer Fixed the close button of the find widget in Assistant Doc: brief Qt Quick introduction on "What's New" page. Interview Demo: Fix warning about pixmap leak on X11. Perform latin1 conversion directly on JSC::UString Avoid conversion between JavaScriptCore String type and QString Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7. Use QList::reserve() in QDataStream>>QList Added static method isValidColor to QColor. compile fix with namespaces build fix for WinCE qDetectCPUFeatures: compile fix with namespaces compile fix for WinCE Mac: using Qt to write plugins disables quit for 3rd party application doc: Fixed building documentation Updated syncqt to use relative include paths on cygwin as well.
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-012-1/+2
| |\ \ \ \ \
| | * | | | | Updated .gitignore with the new name of the qmlviewerThorbjørn Lindeijer2010-03-011-1/+1
| | | | | | |
| | * | | | | Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Done with Christian Kandeler.
| * | | | | | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
| * | | | | Doc: brief Qt Quick introduction on "What's New" page.Volker Hilsheimer2010-03-011-1/+24
| | | | | |
| * | | | | Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | | | | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This conversion needs to be as fast as possible since it's performed every time you access a QObject property from QtScript. Hence, we should avoid going via QString and instead do the conversion ourselves. Reviewed-by: Jedrzej Nowacki
| * | | | | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use JSC::UString internally. Only when the public API demands it should a JSC::UString be converted to a QString. Reviewed-by: Jedrzej Nowacki
| * | | | | Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.Volker Hilsheimer2010-03-011-3/+5
| | | | | |
| * | | | | Use QList::reserve() in QDataStream>>QListAndreas Kling2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | | | | Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| * | | | | compile fix with namespaceshjk2010-03-011-1/+2
| | | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-011-2/+1
| |\ \ \ \ \
| | * | | | | qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
| | | | | | |
| * | | | | | build fix for WinCEMaurice Kalinowski2010-03-011-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only use xmlpatterns if Qt is configured to build it Reviewed-by: Paul Olav Tvete
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-013-4/+19
| |\ \ \ \ \
| | * | | | | Mac: using Qt to write plugins disables quit for 3rd party applicationRichard Moe Gustavsen2010-03-011-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that qt_init always installs/overwrites apple event handlers. So if the 3rd party app had already installed an event handler for kAEQuit, then it will be removed when the Qt plugin is loaded. This patch checks (in the carbon case) if event handlers already exists before installing new ones, or, in the cocoa case, avoids installing apple event handlers if the AA_MacPluginApplication is set. In other words, handling quit etc is seen as the responsibility of the app, and not the plugin. Task-number: QTBUG-8087 Reviewed-by: prasanth
| | * | | | | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qml.qdocconf wasn't renamed yet.
| | * | | | | Updated syncqt to use relative include paths on cygwin as well.Zeno Albisser2010-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0129-35/+48
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make SameGame tutorials share images Fix minehunt demo Make Minehunt demo compile.
generated by cgit v0.12 at 2025-01-10 15:10:06 (GMT)