summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Implement heightForWidth support for QTabWidget and ↵Jan-Arve Sæther2010-04-139-16/+102
| | | | | | QStackedLayout."" This reverts commit 42fc3d36260c409918431c1fc058ee2d10f6c147.
* removed a few warnings on wince buildsThierry Bastian2010-04-132-5/+5
|
* Removed double setting of _WIN32_WINNTThierry Bastian2010-04-133-25/+8
| | | | Derived from the comments in merge request #2175
* QTreeView: remove dead code.Olivier Goffart2010-04-132-20/+0
| | | | | | Not in use since p4 change 221452 Reviewed-by: Gabriel
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-13115-1507/+2393
|\
| * Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."Olivier Goffart2010-04-139-102/+16
| | | | | | | | | | | | This reverts commit d22c8c60ffd986cc46d1f1cab878d60b03b5d4ea. The change is not binary compatible
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1388-1048/+1604
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits) build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much ...
| | * build fix for S60Thierry Bastian2010-04-131-1/+1
| | |
| | * Improve handling of QAction in soft key managerThierry Bastian2010-04-135-16/+22
| | | | | | | | | | | | It also reduces QActionPrivate by 16 bytes.
| | * Remove useless assertThierry Bastian2010-04-131-1/+0
| | | | | | | | | | | | It would make qconfig crash.
| | * qdrawhelper: fix optim in 2245641baOlivier Goffart2010-04-131-29/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 2245641baa58125b57faf12496bc472491565498 was not correct as the x2 (and y2) were not correct on the first line (the value was 1 instead of 0) Fixes tst_QImage::smoothScale3 Reviewed-by: Samuel Rødal
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-13100-1359/+2267
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) doc fixes Don't test XmlListModel examples on platforms without QtXmlPatterns More error output for QML_IMPORT_TRACE=1 Fix declarative examples autotest, avoid using native separators Doc: update Rectangle smooth painting screenshot. Add some TextInput properties and methods Remove GraphicsObjectContainer from the documentation. import Qt 4.6 -> import Qt 4.7 Move documentation code to snippet. Test fix. Fix test Fix test on QWS. Fix PathView crash. Make bindings dump more useful Improve font value type documentation. coding conventions Doc fixes Warning Read Maemo orientation at startup Exclude gestures from examples autotest ...
| | * | doc fixesYann Bodson2010-04-121-5/+15
| | | |
| | * | More error output for QML_IMPORT_TRACE=1mae2010-04-121-0/+9
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12100-1354/+2243
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits) Fix declarative examples autotest, avoid using native separators Doc: update Rectangle smooth painting screenshot. Add some TextInput properties and methods Remove GraphicsObjectContainer from the documentation. import Qt 4.6 -> import Qt 4.7 Move documentation code to snippet. Test fix. Fix test Fix test on QWS. Fix PathView crash. Make bindings dump more useful Improve font value type documentation. coding conventions Doc fixes Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-121-0/+1
| | | |\ \
| | | | * | Doc: update Rectangle smooth painting screenshot.Yann Bodson2010-04-121-0/+1
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-12154-1949/+3538
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/graphicsitems/qdeclarativetextinput_p.h
| | | | * | Move documentation code to snippet.Yann Bodson2010-04-121-41/+15
| | | | | |
| | | | * | Fix PathView crash.Michael Brasser2010-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9753
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1221-522/+1455
| | | | |\ \
| | | | | * | Improve font value type documentation.Yann Bodson2010-04-123-5/+316
| | | | | | |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-1218-517/+1128
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/javascriptblocks.qdoc
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1299-1258/+1733
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits) Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes Start documenting coding conventions Adds missing qml file to qdeclarativeflipable autotest Revert "Better reporting of extension plugin loading errors." Doc Fix graphicswidget auto-test. Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. ...
| | | | | * | | | Doc fixesBea Lam2010-04-121-0/+15
| | | | | | | | |
| | | | * | | | | Make bindings dump more usefulAaron Kennedy2010-04-121-46/+69
| | | | | |_|/ / | | | | |/| | |
| | | | * | | | Fix crash on QScriptProgram destructionAaron Kennedy2010-04-121-0/+4
| | | | |/ / /
| | | | * | | Revert "Better reporting of extension plugin loading errors."Aaron Kennedy2010-04-121-23/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0dcdbd2984299665b9b784b201289219b9978d3.
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1098-1264/+1751
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits) Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. Make sure WorkerScript thread is stopped on deletion. This also fixes Release ListModel's worker agent on deletion. Doc fixes Fix example Example code style improvements Enable other wrapping modes. TextEdit::wrap changed to TextEdit::wrapMode enumeration Remove use of obsolete "Script" element. unwarn Replace "var" with "variant" in tests Fix test after deletion of GraphicsObjectContainer. ...
| | | | | * | | CleanupAaron Kennedy2010-04-092-88/+95
| | | | | | | |
| | | | | * | | Disallow writes to read-only value type propertiesAaron Kennedy2010-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9685
| | | | | * | | Allow undefined to be assigned to QVariant propertiesAaron Kennedy2010-04-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9704
| | | | | * | | Add a Qt.isQtObject() methodAaron Kennedy2010-04-092-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9705
| | | | | * | | Fix crash in QML library importsAaron Kennedy2010-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9705
| | | | | * | | Remove QT_VERSION checks in QMLAaron Kennedy2010-04-098-56/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only support Qt 4.7 now.
| | | | | * | | List properties aren't read-onlyAaron Kennedy2010-04-091-1/+2
| | | | | | | |
| | | | | * | | Small doc fix.Martin Jones2010-04-092-7/+7
| | | | | | | |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-1/+16
| | | | | |\ \ \
| | | | | | * | | Make sure WorkerScript thread is stopped on deletion. This also fixesBea Lam2010-04-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the leaking of the worker agent in ListModel.
| | | | | | * | | Release ListModel's worker agent on deletion.Bea Lam2010-04-092-1/+3
| | | | | | | | |
| | | | | * | | | Enable other wrapping modes.Martin Jones2010-04-094-15/+18
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word. WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-091-1/+1
| | | | | |\ \ \
| | | | | | * | | unwarnWarwick Allison2010-04-091-1/+1
| | | | | | | | |
| | | | | * | | | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-095-26/+57
| | | | | | | | |
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0916-578/+54
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | Fix url resolution in PropertyChanges.Michael Brasser2010-04-093-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure bindings in PropertyChanges resolve urls correctly. Also refactor the code so that PropertyChanges will always use the standard url resolution support provided by QDeclarativeProperty. Task-number: QTBUG-9571
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-091-7/+23
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0912-560/+100
| | | | | | | |\ \ \
| | | | | | | * | | | Better reporting of extension plugin loading errors.Warwick Allison2010-04-091-7/+23
| | | | | | | | | | |
| | | | | | * | | | | Use variant instead of var in QMLAaron Kennedy2010-04-093-21/+10
| | | | | | | |/ / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QML "var"s are not the same as JavaScript vars - they are QVariants instead. However, as they behave in a similar enough fashion to native JavaScript it can be confusing to developers when they are called "var".