| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85.
This change introduced some regression due to itemChange notifications
not being delivered as expected (reported by Warwick). We have to find
another solution, unfortunately. However, the performance penalty isn't
that big so we can live with it for now.
|
| |
| |
| |
| | |
Task-number: QTBUG-8343
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8305
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
has proven to be confusing in practice.
property/target and properties/targets will be functionally equivilant
(the only distinction being singular/plural). In a transition these
properties can be used for both 'matching' and explicit animation
based on whether a 'to' value is supplied.
The documentation, tests, examples and demos have been updated as well.
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Add missing NOTIFY signals to various QML item class properties
Fix currentIndex after itemsMoved()
qmlviewer: build on symbian
Revert "Replace QList<>* support with QmlListProperty"
Declare QmlXmlListModelRole meta type before any code uses it.
Make compile on Symbian (call Q_DECLARE_METATYPE earlier)
Conditionally link webkit on wince
Revert "Run dos2unix on these files."
Expose LayoutItem documentation
Fix palette on the N900
Fix QTBUG-8090, improve original patch effectiveness.
Replace QList<>* support with QmlListProperty
Run dos2unix on these files.
Remove standalone QmlDebugger. It is now only available through the
Mobility 404
Fix crash in QmlMetaProperty that could occur when using value-type
QML binding optimizer crash
QML binding optimizer crash
Fix crash in QML binding optimizer
Don't delete binding directly
...
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Aaron Kennedy
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure fixupPosition() positions properly for StrictlyEnforceRange
highlight mode.
Update visibleIndex after itemsMoved().
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was accidentally pushed early.
This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Also made it slightly more verbose.
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qmlgraphicsitem.cpp
src/declarative/qml/qmlmetaproperty.cpp
src/declarative/qml/qmlmetatype.cpp
|
| | |\ \ |
|
| | | | | |
|
| | |/ / |
|
| | |\ \ |
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit should make declarative compile against 4.6.2 again.
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Was accidentally ignoring key movements even when an existing selection
meant that pressing right/left would do something.
Task-number: QT-2944
|
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Change 282a46ab5edafa7b82e9c58658143cb979db2d85 prevents itemChange()
notification. That seems wrong, but this change is a work-around.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Remove unneeded .moc imports resulting from moved classes.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
construction.
Task-number: QT-2798
|
| |_|/
|/| | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
Fix copyright year.
Fix broken license headers.
doc: Fixed some qdoc errors.
Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
doc: Fixed some qdoc errors.
QNetworkAccessManager: add method to send custom requests
doc: Fixed some qdoc errors.
Optimization: Avoid calling out to public API function
Mac: submenu shows up at the wrong position
Add operator< and qHash for QSharedPointer and fix operator-.
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/ |
|
|/
|
|
|
| |
Add to translations profile. move stuff out of QObject-context,
correct spelling and contractions, correct usage of tr().
|
|
|
|
|
|
|
|
|
| |
Also fixes
-Scrolling backwards when model.count != 0 mod pathItemCount
-A minor typo in a comment
Task-number: QTBUG-6865
Reviewed-by: Martin Jones
|
| |
|
|
|
|
| |
Reviewed-by: Martin Jones
|
|
|
|
|
| |
Task-number: QT-2823
Reviewed-by: Aaron Kennedy
|
|\ |
|
| | |
|
|/ |
|
|
|
|
| |
This reverts commit d914555badcd4761864657e1e335e657b791453f.
|
| |
|
|
|
|
|
|
|
| |
Note that a resolution will be required for QTBUG-8025 before the
QRegExpValidator is useful.
Task-number: QTBUG-7068
|
|
|
|
|
|
|
|
|
| |
In order to show the virtual keyboard we need to send
RequestSoftwareInputPanel. I also fixed TextInput regarding the
inputQuery implementation.
Task-number:QTBUG-7602
Reviewed-by:akennedy
|
|\ |
|
| |
| |
| |
| | |
Task-number: QTBUG-7430
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
| |
|